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

Treeve Jelbert scm at sourcemage.org
Tue Oct 16 05:12:29 EDT 2007


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

 kde-core/arts/DETAILS                                |    6 -
 kde-core/arts/HISTORY                                |    3 
 kde-core/kde-i18n/DETAILS                            |    2 
 kde-core/kde-i18n/HISTORY                            |    3 
 kde-core/kde-profile/DETAILS                         |    2 
 kde-core/kde-profile/HISTORY                         |    3 
 kde-core/kdebase/DETAILS                             |    4 
 kde-core/kdebase/HISTORY                             |    5 +
 kde-core/kdebase/PRE_BUILD                           |    2 
 kde-core/kdebase/post-3.5.7-kdebase-kdm.diff         |   63 --------------
 kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff |   49 -----------
 kde-core/kdelibs/DETAILS                             |    4 
 kde-core/kdelibs/HISTORY                             |    4 
 kde-core/kdelibs/PRE_BUILD                           |    5 -
 kde-core/kdelibs/cups.diff                           |   82 -------------------
 kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff   |   34 -------
 16 files changed, 27 insertions(+), 244 deletions(-)

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

    kdebase-3.5.8

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

    kde-profile-3.5.8

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

    kde-i18n-3.5.8

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

    kdelibs-3.5.8

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

    arts-1.5.8

diff --git a/kde-core/arts/DETAILS b/kde-core/arts/DETAILS
index 792a6bb..8aa9c55 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.7
-     SOURCE_HASH=sha512:e2bcd5bfcf60a7b34a9ccf3bbfc9e8fee67336643b78044db649f2009dec4ae8b4cc864fcee626a9edfb737e17d179fea2111999264c5b8ceee5fa20977d95ef
+         VERSION=1.5.8
+     SOURCE_HASH=sha512:0dc73511e44ca9c6408f4aa0eb0f3d3d6de97cfc235036f518fcb0ecebab54ce407fe5035672e1a2ddc33a3217b0df8bd04da9d641e1a98fb4bba2c53f115a55
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$KDE_URL/stable/3.5.7/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/3.5.8/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 84877a3..6ac7c33 100644
--- a/kde-core/arts/HISTORY
+++ b/kde-core/arts/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.5.8
+
 2007-05-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 1.5.7
diff --git a/kde-core/kde-i18n/DETAILS b/kde-core/kde-i18n/DETAILS
index 2addb21..cff6d1d 100755
--- a/kde-core/kde-i18n/DETAILS
+++ b/kde-core/kde-i18n/DETAILS
@@ -1,7 +1,7 @@
 # the remaining details of this spell are provided by CONFIGURE
 source  $SECTION_DIRECTORY/KDE_DETAILS
            SPELL=kde-i18n
-         VERSION=3.5.7
+         VERSION=3.5.8
             SITE=$KDE_URL/stable/${VERSION//.0/}/src/$SPELL
 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde-core/kde-i18n/HISTORY b/kde-core/kde-i18n/HISTORY
index b89b146..a2a3e8e 100644
--- a/kde-core/kde-i18n/HISTORY
+++ b/kde-core/kde-i18n/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.5.8
+
 2007-05-23 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated spell to 3.5.7
 
diff --git a/kde-core/kde-profile/DETAILS b/kde-core/kde-profile/DETAILS
index a4fbc8a..f73b505 100755
--- a/kde-core/kde-profile/DETAILS
+++ b/kde-core/kde-profile/DETAILS
@@ -1,5 +1,5 @@
            SPELL=kde-profile
-         VERSION=3.5.7
+         VERSION=3.5.8
         WEB_SITE=http://www.kde.org/
          ENTERED=20010922
         KEYWORDS="kde"
diff --git a/kde-core/kde-profile/HISTORY b/kde-core/kde-profile/HISTORY
index 2ed7854..a7539a6 100644
--- a/kde-core/kde-profile/HISTORY
+++ b/kde-core/kde-profile/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.5.8
+
 2007-05-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated spell to 3.5.7
 
diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index ac7e9d1..6ccc40f 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.7
-     SOURCE_HASH=sha512:b7a01346b36b0bf6c4fcfe6104f738c60f188864d942286e9bf785f8e53ddd0e4643766d285cb499b6bf3cd61d3c0fd3c88f0e5e7c4498faeadadd6e1d1d957b
+         VERSION=3.5.8
+     SOURCE_HASH=sha512:5385d94939300fe1f79e15fbe5f26387c19d7b9da1744915ac47cd17a8f223a56c8a6aae9e92b3c22037303bf978f2bd3a7d2d97a40a2d7585458afe6cb46024
           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 ef7edf9..447fcdf 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,8 @@
+2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.5.8
+	* PRE_BUILD: don't apply security patches 
+	* *.diff: deleted, already applied upstream
+
 2007-09-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: SECURTIY_PATCH++
 	  CVE-2007-4224 CVE-2007-4225 CVE-2007-3820 CVE-2007-4569
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 3557726..49d7088 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY 	   &&
-patch  -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-konqueror-2.diff  &&
-patch  -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-kdm.diff          &&
 # splashscreen patch
 if [[ $SMGL_THEME == "y" ]]; then
   unpack_file 2
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff b/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
deleted file mode 100644
index 40b6abb..0000000
--- a/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- kdm/backend/session.c
-+++ kdm/bakcend/session.c
-@@ -121,8 +121,9 @@
- static void
- DoAutoLogon( void )
- {
--	StrDup( &curuser, td->autoUser );
--	StrDup( &curpass, td->autoPass );
-+	ReStr( &curuser, td->autoUser );
-+	ReStr( &curpass, td->autoPass );
-+	ReStr( &curtype, "classic" );
- 	cursource = PWSRC_AUTOLOGIN;
- }
- 
-@@ -141,7 +142,9 @@
- 		td->hstent->npass = 0;
- 		newdmrc = td->hstent->nargs;
- 		td->hstent->nargs = 0;
-+		ReStr( &curtype, "classic" );
- 		cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
-+		return 1;
- 	} else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain))
- 	{
- 		unsigned int lmask;
-@@ -153,11 +156,9 @@
- 		if (lmask & ShiftMask)
- 			return 0;
- 		DoAutoLogon();
--	} else {
--		cursource = PWSRC_MANUAL;
--		return 0;
-+		return 1;
- 	}
--	return 1;
-+	return 0;
- }
- 
- 
-@@ -369,6 +370,7 @@
- 			if (curtype) free( curtype );
- 			curtype = GRecvStr();
- 			Debug( " type %\"s\n", curtype );
-+			cursource = PWSRC_MANUAL;
- 			if (Verify( conv_interact, rootok )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -378,7 +380,6 @@
- 		case G_AutoLogin:
- 			Debug( "G_AutoLogin\n" );
- 			DoAutoLogon();
--			StrDup( &curtype, "classic" );
- 			if (Verify( conv_auto, FALSE )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -565,7 +566,7 @@
- 	tdiff = td->autoAgain ? 
- 	           1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
- 	if (AutoLogon( tdiff )) {
--		if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto, FALSE ))
-+		if (!Verify( conv_auto, FALSE ))
- 			goto gcont;
- 		if (greeter)
- 			GSendInt( V_OK );
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff b/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
deleted file mode 100644
index 0d6e44e..0000000
--- a/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- konqueror/konq_combo.cc
-+++ konqueror/konq_combo.cc
-@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
-         kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
-                                   "addToCombo(QString,QCString)", data);
-     }
-+    // important security consideration: always display the beginning
-+    // of the url rather than its end to prevent spoofing attempts.
-+    lineEdit()->setCursorPosition( 0 );
- }
- 
- void KonqCombo::setTemporary( const QString& text )
---- konqueror/konq_mainwindow.cc
-+++ konqueror/konq_mainwindow.cc
-@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
-   }
-   else // no known serviceType, use KonqRun
-   {
--      if ( ( view && view == m_currentView ) ||
--              ( !view && !req.newTab ) ) // startup with argument
-+      if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument
-       {
-           // Show it for now in the location bar, but we'll need to store it in the view
-           // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called).
--          kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
-+          kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl;
-           setLocationBarURL( url );
-       }
- 
-@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
-         if ( childView )
-         {
-             enableAllActions( true );
--
--            m_pViewManager->setActivePart( childView->part() );
-             m_currentView = childView;
-         }
-       }
---- konqueror/konq_viewmgr.cc
-+++ konqueror/konq_viewmgr.cc
-@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
- 
- void KonqViewManager::emitActivePartChanged()
- {
-+    // prevent unnecessary multiple calls to slotPartActivated:
-+    m_activePartChangedTimer->stop();
-     m_pMainWindow->slotPartActivated( activePart() );
- }
- 
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index d77e631..48db127 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.7
-     SOURCE_HASH=sha512:860e3d9c041a9086077893590a556980c402ca6a08938b5ac48aeb29c8366576f6c3078e624263b4e097338f6a57255da4e1df1cb7b4e54a6cb330dd28a081af
+         VERSION=3.5.8
+     SOURCE_HASH=sha512:70bd419337b1e1efc46f4ddcb678754371f49993c8dbdda3a67aeea0954154eede13e433f07b94b4a1be8b8427f38e3affcbd01f32fe3197f7f9dcb5f1f551c0
           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 1bb1490..dee9263 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,7 @@
+2007-10-16  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.5.8
+	* PRE_BUILD, *.diff: deleted, already applied
+
 2007-09-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: SECURITY_PATCH++
 	* post-3.5.7-kdelibs-kdecore-2.diff: added
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
deleted file mode 100755
index 969f941..0000000
--- a/kde-core/kdelibs/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build      &&
-cd $SOURCE_DIRECTORY   &&
-#patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore.diff  &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore-2.diff  &&
-patch -p1 < $SPELL_DIRECTORY/cups.diff
diff --git a/kde-core/kdelibs/cups.diff b/kde-core/kdelibs/cups.diff
deleted file mode 100644
index 124d799..0000000
--- a/kde-core/kdelibs/cups.diff
+++ /dev/null
@@ -1,82 +0,0 @@
---- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2006-10-01 12:33:43.000000000 -0500
-+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-19 15:12:48.000000000 -0500
-@@ -108,7 +108,8 @@ cupsGetConf(void)
-       * See if we should retry the current digest password...
-       */
- 
--      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0 ||
-           digest_tries > 1 || !pwdstring[0])
-       {
-        /*
-@@ -116,7 +117,7 @@ cupsGetConf(void)
- 	*/
- 
- 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
--        	 cups_server->hostname);
-+        	 cupsServer());
- 
-         if ((password = cupsGetPassword(prompt)) == NULL)
- 	  break;
-@@ -135,7 +136,8 @@ cupsGetConf(void)
-       * Got a password; encode it for the server...
-       */
- 
--      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0)
-       {
-        /*
- 	* Basic authentication...
-@@ -334,7 +336,8 @@ cupsPutConf(const char *name)		/* I - Na
-       * See if we should retry the current digest password...
-       */
- 
--      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0 ||
-           digest_tries > 1 || !pwdstring[0])
-       {
-        /*
-@@ -342,7 +345,7 @@ cupsPutConf(const char *name)		/* I - Na
- 	*/
- 
- 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
--        	 cups_server->hostname);
-+        	 cupsServer());
- 
-         if ((password = cupsGetPassword(prompt)) == NULL)
- 	  break;
-@@ -361,7 +364,8 @@ cupsPutConf(const char *name)		/* I - Na
-       * Got a password; encode it for the server...
-       */
- 
--      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0)
-       {
-        /*
- 	* Basic authentication...
---- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-01-15 05:34:19.000000000 -0600
-+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:15:09.000000000 -0500
-@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
- 		return false;
- 	}
- 
--#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- 	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
- #endif
- 
-@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
- 	}
- 
- 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
--#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- 	cups_authstring = HTTP->authstring;
- #endif
- 	httpClose(HTTP);
diff --git a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
deleted file mode 100644
index 50a9ed1..0000000
--- a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdecore/kurl.cpp
-+++ kdecore/kurl.cpp
-@@ -30,6 +30,7 @@
- #include <kglobal.h>
- #include <kidna.h>
- #include <kprotocolinfo.h>
-+#include <kstringhandler.h>
- #endif
- 
- #include <stdio.h>
-@@ -183,7 +184,7 @@ static QString lazy_encode( const QStrin
-         (character == '?') || // Start of query delimiter
-         ((character == '@') && encodeAt) || // Username delimiter
-         (character == '#') || // Start of reference delimiter
--        ((character == 32) && (i+1 == old_length))) // A trailing space
-+        ((character == 32) && (i+1 == old_length || segment[i+1] == ' '))) // A trailing space
-     {
-       new_segment[ new_length++ ] = '%';
- 
-@@ -1540,7 +1541,13 @@ QString KURL::prettyURL( int _trailing )
-     u += "//";
-     if ( hasUser() )
-     {
--      u += lazy_encode(m_strUser);
-+      QString s = m_strUser;
-+#ifndef KDE_QT_ONLY
-+      // shorten the username, its unlikely to be valid without password anyway
-+      if (!hasPass())
-+          s = KStringHandler::csqueeze(s, 16);
-+#endif
-+      u += encode(s, 0, 0);
-       // Don't show password!
-       u += "@";
-     }



More information about the SM-Commit mailing list