Hello community,
here is the log from the commit of package kdeadmin4
checked in at Tue Oct 16 18:03:57 CEST 2007.
--------
--- KDE/kdeadmin4/kdeadmin4.changes 2007-09-13 14:48:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2007-10-09 14:42:03.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Oct 9 14:41:59 CEST 2007 - dmueller@suse.de
+
+- update to KDE 4.0 Beta3
+
+-------------------------------------------------------------------
+Tue Oct 2 15:53:31 CEST 2007 - stbinner@suse.de
+
+- update to 3.93.0.svn720128
+
+-------------------------------------------------------------------
+Tue Oct 2 15:51:49 CEST 2007 - stbinner@suse.de
+
+- update to 3.93.0.svn720128
+
+-------------------------------------------------------------------
+Wed Sep 26 14:00:56 CEST 2007 - stbinner@suse.de
+
+- update to 3.93.0.svn717248
+
+-------------------------------------------------------------------
Old:
----
kdeadmin-3.93.0.tar.bz2
New:
----
kdeadmin-3.94.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeadmin4.spec ++++++
--- /var/tmp/diff_new_pack.C24208/_old 2007-10-16 18:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.C24208/_new 2007-10-16 18:03:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeadmin4 (Version 3.93.0.svn712059)
+# spec file for package kdeadmin4 (Version 3.94.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: kdeadmin base package
Url: http://www.kde.org
-Version: 3.93.0.svn712059
+Version: 3.94.0
Release: 1
-%define rversion 3.93.0
+%define rversion 3.94.0
Source0: kdeadmin-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -212,8 +212,15 @@
%files
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-
%changelog
+* Tue Oct 09 2007 - dmueller@suse.de
+- update to KDE 4.0 Beta3
+* Tue Oct 02 2007 - stbinner@suse.de
+- update to 3.93.0.svn720128
+* Tue Oct 02 2007 - stbinner@suse.de
+- update to 3.93.0.svn720128
+* Wed Sep 26 2007 - stbinner@suse.de
+- update to 3.93.0.svn717248
* Thu Sep 13 2007 - stbinner@suse.de
- update to 3.93.0.svn712059
* Sat Sep 01 2007 - stbinner@suse.de
++++++ kdeadmin-3.93.0.tar.bz2 -> kdeadmin-3.94.0.tar.bz2 ++++++
Files old/kdeadmin-3.93.0/doc/kcron/index.cache.bz2 and new/kdeadmin-3.94.0/doc/kcron/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/kdat/index.cache.bz2 and new/kdeadmin-3.94.0/doc/kdat/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/knetworkconf/index.cache.bz2 and new/kdeadmin-3.94.0/doc/knetworkconf/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/kpackage/index.cache.bz2 and new/kdeadmin-3.94.0/doc/kpackage/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/ksysv/index.cache.bz2 and new/kdeadmin-3.94.0/doc/ksysv/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/kuser/index.cache.bz2 and new/kdeadmin-3.94.0/doc/kuser/index.cache.bz2 differ
Files old/kdeadmin-3.93.0/doc/lilo-config/index.cache.bz2 and new/kdeadmin-3.94.0/doc/lilo-config/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/cthost.cpp new/kdeadmin-3.94.0/kcron/cthost.cpp
--- old/kdeadmin-3.93.0/kcron/cthost.cpp 2007-05-01 19:21:03.000000000 +0200
+++ new/kdeadmin-3.94.0/kcron/cthost.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -26,6 +26,8 @@
#include
+#include <QTextStream>
+
using namespace std;
CTHost::CTHost(const QString& cronBinary)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/kcron.desktop new/kdeadmin-3.94.0/kcron/kcron.desktop
--- old/kdeadmin-3.93.0/kcron/kcron.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/kcron/kcron.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -7,7 +7,6 @@
Name=KCron
Name[af]= kcron
Name[eo]=Taskoplanilo
-Name[ko]=KDE 크론
Name[ne]=केडीई क्रोन
Name[sv]=Kcron
Name[ta]=கேக்ரொன்
@@ -71,6 +70,7 @@
GenericName[wa]=Tiestires C
GenericName[x-test]=xxTask Schedulerxx
GenericName[xh]=Umcwangcisi Womsebenzi
+GenericName[zh_CN]=任务调度程序
GenericName[zh_HK]=工作排程器
GenericName[zh_TW]=工作排程器
Terminal=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/ktapp.cpp new/kdeadmin-3.94.0/kcron/ktapp.cpp
--- old/kdeadmin-3.93.0/kcron/ktapp.cpp 2007-08-26 11:55:32.000000000 +0200
+++ new/kdeadmin-3.94.0/kcron/ktapp.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -31,6 +31,7 @@
#include "ktview.h"
#include
#include
+#include
#include <QLabel>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/ktlisttask.cpp new/kdeadmin-3.94.0/kcron/ktlisttask.cpp
--- old/kdeadmin-3.93.0/kcron/ktlisttask.cpp 2007-08-28 18:26:26.000000000 +0200
+++ new/kdeadmin-3.94.0/kcron/ktlisttask.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -63,7 +63,7 @@
// using KIconLoader() instead of getMaxIcon() because we need a null pixmap if pixmap cannot be found
KIconLoader *loader = KIconLoader::global();
- QPixmap qpIcon(loader->loadIcon(qsCommand, K3Icon::Small, 0, K3Icon::DefaultState, QStringList(), 0L, true));
+ QPixmap qpIcon(loader->loadIcon(qsCommand, KIconLoader::Small, 0, KIconLoader::DefaultState, QStringList(), 0L, true));
if (qpIcon.isNull()) qpIcon = KTIcon::getMiniIcon("gear");
setPixmap(0, qpIcon);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/kttask.cpp new/kdeadmin-3.94.0/kcron/kttask.cpp
--- old/kdeadmin-3.93.0/kcron/kttask.cpp 2007-08-26 11:55:32.000000000 +0200
+++ new/kdeadmin-3.94.0/kcron/kttask.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -536,7 +536,7 @@
// using KIconLoader() instead of getMaxIcon() because we need a null pixmap if pixmap cannot be found
KIconLoader *loader = KIconLoader::global();
- QPixmap qpIcon(loader->loadIcon(qsCommand, K3Icon::Desktop, 0, K3Icon::DefaultState, QStringList(), 0L, true));
+ QPixmap qpIcon(loader->loadIcon(qsCommand, KIconLoader::Desktop, 0, KIconLoader::DefaultState, QStringList(), 0L, true));
if (qpIcon.isNull()) qpIcon = KTIcon::task(KTIcon::Large);
titleWidget->setText(i18n("Add or modify a Kcron task"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kdat/ImageCache.cpp new/kdeadmin-3.94.0/kdat/ImageCache.cpp
--- old/kdeadmin-3.93.0/kdat/ImageCache.cpp 2006-03-22 15:15:24.000000000 +0100
+++ new/kdeadmin-3.94.0/kdat/ImageCache.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -26,24 +26,24 @@
{
KIconLoader *l = KGlobal::iconLoader();
/* 2002-01-24 FP */
- // _archive = new QPixmap(l->iconPath("package", K3Icon::Toolbar));
- _archive = new QPixmap(l->iconPath("tar", K3Icon::Small));
+ // _archive = new QPixmap(l->iconPath("package", KIconLoader::Toolbar));
+ _archive = new QPixmap(l->iconPath("tar", KIconLoader::Small));
/* 2002-01-24 FP */
- _backup = new QPixmap(l->iconPath("kdat_backup", K3Icon::Toolbar));
- _file = new QPixmap(l->iconPath("mime_empty", K3Icon::Small));
- _folderClosed = new QPixmap(l->iconPath("folder_blue", K3Icon::Small));
- _folderOpen = new QPixmap(l->iconPath("folder_blue_open", K3Icon::Small));
- _restore = new QPixmap(l->iconPath("kdat_restore", K3Icon::Toolbar));
- _selectAll = new QPixmap(l->iconPath("kdat_select_all", K3Icon::Toolbar));
- _selectNone = new QPixmap(l->iconPath("kdat_select_none", K3Icon::Toolbar));
- _selectSome = new QPixmap(l->iconPath("kdat_select_some", K3Icon::Toolbar));
+ _backup = new QPixmap(l->iconPath("kdat_backup", KIconLoader::Toolbar));
+ _file = new QPixmap(l->iconPath("mime_empty", KIconLoader::Small));
+ _folderClosed = new QPixmap(l->iconPath("folder_blue", KIconLoader::Small));
+ _folderOpen = new QPixmap(l->iconPath("folder_blue_open", KIconLoader::Small));
+ _restore = new QPixmap(l->iconPath("kdat_restore", KIconLoader::Toolbar));
+ _selectAll = new QPixmap(l->iconPath("kdat_select_all", KIconLoader::Toolbar));
+ _selectNone = new QPixmap(l->iconPath("kdat_select_none", KIconLoader::Toolbar));
+ _selectSome = new QPixmap(l->iconPath("kdat_select_some", KIconLoader::Toolbar));
// 2002-01-28 FP
- // _tape = new QPixmap(l->iconPath("kdat_archive", K3Icon::Toolbar));
- _tape = new QPixmap(l->iconPath("kdat", K3Icon::Small));
+ // _tape = new QPixmap(l->iconPath("kdat_archive", KIconLoader::Toolbar));
+ _tape = new QPixmap(l->iconPath("kdat", KIconLoader::Small));
// 2002-01-28 FP
- _tapeMounted = new QPixmap(l->iconPath("kdat_mounted", K3Icon::Toolbar));
- _tapeUnmounted = new QPixmap(l->iconPath("kdat_unmounted", K3Icon::Toolbar));
- _verify = new QPixmap(l->iconPath("kdat_verify", K3Icon::Toolbar));
+ _tapeMounted = new QPixmap(l->iconPath("kdat_mounted", KIconLoader::Toolbar));
+ _tapeUnmounted = new QPixmap(l->iconPath("kdat_unmounted", KIconLoader::Toolbar));
+ _verify = new QPixmap(l->iconPath("kdat_verify", KIconLoader::Toolbar));
}
ImageCache::~ImageCache()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kdat/kdat.desktop new/kdeadmin-3.94.0/kdat/kdat.desktop
--- old/kdeadmin-3.93.0/kdat/kdat.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/kdat/kdat.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -3,7 +3,6 @@
Name=KDat
Name[af]=Kdat
Name[eo]=Surbendigilo
-Name[ko]=KDE Dat
Name[ne]=केडीई ड्याट
Name[sv]=Kdat
Name[ta]=கேடாட்
@@ -28,7 +27,7 @@
GenericName[fi]=Nauhavarmistustyökalu
GenericName[fr]=Outil de sauvegarde sur bandes
GenericName[ga]=Uirlis Chúltaca Téipe
-GenericName[gl]=Cópia de Seguridade en Cintas
+GenericName[gl]=Copia de seguridade en cintas
GenericName[he]=כלי גיבוי באמצעות סרט
GenericName[hr]=Alat za izradu sigurnosne kopije na traci
GenericName[hu]=Szalagos mentés
@@ -36,14 +35,14 @@
GenericName[it]=Strumento per la copia di sicurezza su nastro
GenericName[ja]=テープバックアップツール
GenericName[kk]=Таспаға сақтық көшірмелеу құралы
-GenericName[ko]=테이프로 여벌 받는 도구
+GenericName[ko]=테이프 백업 도구
GenericName[lt]=Juostinio archyvavimo priemonė
GenericName[lv]=Lentas Rezervēšanas Rīks
GenericName[mk]=Алатка за заштитни копии на ленти
GenericName[ms]=Alat Ganti Sedia
GenericName[nb]=Verktøy for sikkerhetskopiering til magnetbånd
GenericName[nds]=Bandsekerheitkopiewarktüüch
-GenericName[ne]=टेप जगेडा उपकरण
+GenericName[ne]=टेप ब्याकअप उपकरण
GenericName[nl]=Tape backup-programma
GenericName[nn]=Reservekopiering på band
GenericName[pa]=ਟੇਪ ਬੈਕਅੱਪ ਸੰਦ
@@ -66,6 +65,7 @@
GenericName[wa]=Usteye di copeyes di såvrité so bindes
GenericName[x-test]=xxTape Backup Toolxx
GenericName[xh]=Isixhobo Sokuncedisa Iteyipu
+GenericName[zh_CN]=磁带备份工具
GenericName[zh_HK]=磁帶備份工具
GenericName[zh_TW]=磁帶備份工具
Exec=kdat %i -caption "%c"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin-3.94.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
--- old/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-09-05 08:29:55.000000000 +0200
+++ new/kdeadmin-3.94.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -17,6 +17,7 @@
X-KDE-ParentApp=kcontrol
Comment=Configure Network Settings
+Comment[ar]=اضبط إعدادات الشبكة
Comment[be]=Наставіць сетку
Comment[bg]=Настройване на мрежата
Comment[br]=Kefluniañ dibarzhoù ar rouedad
@@ -38,8 +39,9 @@
Comment[hu]=A hálózat beállításai
Comment[is]=Umsjón netstillinga
Comment[it]=Configura le impostazioni di rete
-Comment[ja]=ネットワーク設定
+Comment[ja]=ネットワークの設定
Comment[kk]=Желінің параметрлерін баптау
+Comment[ko]=네트워크 설정
Comment[lt]=Konfigūruoti tinklo nustatymus
Comment[mk]=Конфигурирајте ги поставуањата за мрежата
Comment[nb]=Sett opp nettverksinnstillinger
@@ -61,6 +63,7 @@
Comment[uk]=Налаштувати мережні параметри
Comment[vi]=Cấu hình thiết lập mạng
Comment[x-test]=xxConfigure Network Settingsxx
+Comment[zh_CN]=配置网络设置
Comment[zh_HK]=設定網絡設置
Comment[zh_TW]=設定網路
Terminal=false
@@ -87,8 +90,9 @@
Name[hu]=Hálózati beállítások
Name[is]=Netstillingar
Name[it]=Impostazioni di rete
-Name[ja]=ネットワーク設定
+Name[ja]=ネットワークの設定
Name[kk]=Желінің параметрлері
+Name[ko]=네트워크 설정
Name[lt]=Tinklo nustatymai
Name[mk]=Поставувања на мрежа
Name[nb]=Nettverksoppsett
@@ -110,6 +114,7 @@
Name[uk]=Мережні параметри
Name[vi]=Thiết lập mạng
Name[x-test]=xxNetwork Settingsxx
+Name[zh_CN]=网络设置
Name[zh_HK]=網絡設置
Name[zh_TW]=網路設定
Keywords=Network,DNS,routes,interfaces
@@ -133,6 +138,7 @@
Keywords[hu]=Hálózat,DNS,útvonalak,hálózati csatolók
Keywords[it]=Rete,DNS,route,interfacce
Keywords[ja]=ネットワーク,DNS,ルート,インターフェース
+Keywords[ko]=네트워크,DNS,인터페이스
Keywords[lt]=Network,DNS,routes,interfaces,tinklas,DNS,maršrutai,sąsajos
Keywords[mk]=Network,DNS,routes,interfaces,Мрежа,рути,интерфејси
Keywords[nb]=Nettverk,DNS,ruter,grensesnitt
@@ -153,5 +159,6 @@
Keywords[uk]=Network,DNS,routes,interfaces,мережа,інтерфейси
Keywords[vi]=Network,mạng,DNS,routes,tuyến,interfaces,giao diện
Keywords[x-test]=xxNetwork,DNS,routes,interfacesxx
+Keywords[zh_CN]=Network,DNS,routes,interfaces,网络,路由,接口
Keywords[zh_HK]=Network,DNS,routes,interfaces,網絡,路由,介面
Keywords[zh_TW]=網路,DNS,路由,介面
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop new/kdeadmin-3.94.0/knetworkconf/knetworkconf/knetworkconf.desktop
--- old/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/knetworkconf/knetworkconf/knetworkconf.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -6,6 +6,7 @@
Icon=knetworkconf
X-DocPath=knetworkconf/index.docbook
Comment=Configure TCP/IP settings
+Comment[ar]=اضبط إعدادات بروتوكول التحكم بالنقل/بروتوكول الإنترنت
Comment[be]=Наставіць TCP/IP
Comment[bg]=Настройване настройките на TCP/IP
Comment[br]=Kefluniañ an dibarzhoù TCP/IP
@@ -29,6 +30,7 @@
Comment[it]=Configura le impostazioni TCP/IP
Comment[ja]=TCP/IP の設定
Comment[kk]=TCP/IP параметрлерін баптау
+Comment[ko]=TCP/IP 설정
Comment[lt]=Konfigūruoti TCP/IP nustatymus
Comment[mk]=Конфигурирајте поставувања за TCP/IP
Comment[nb]=Sett opp TCP/IP-innstillinger
@@ -50,11 +52,11 @@
Comment[uk]=Налаштувати параметри TCP/IP
Comment[vi]=Cấu hình thiết lập TCP/IP
Comment[x-test]=xxConfigure TCP/IP settingsxx
+Comment[zh_CN]=配置 TCP/IP 设置
Comment[zh_HK]=設定 TCP/IP 設置
Comment[zh_TW]=設定 TCP/IP
Terminal=false
Name=KNetworkConf
-Name[ne]=केडीई सञ्जाल कन्फिगरेसन
Name[pa]=ਕੇ-ਨੈੱਟਵਰਕ-ਸੰਰਚਨਾ
Name[pt_BR]=KNetworkConf
Name[sv]=Knetworkconf
@@ -83,6 +85,7 @@
GenericName[it]=Configura le impostazioni TCP/IP
GenericName[ja]=TCP/IP の設定
GenericName[kk]=TCP/IP параметрлерін баптау
+GenericName[ko]=TCP/IP 설정
GenericName[lt]=Konfigūruoti TCP/IP nustatymus
GenericName[mk]=Конфигурирајте поставувања за TCP/IP
GenericName[nb]=Sett opp TCP/IP-innstillinger
@@ -104,5 +107,6 @@
GenericName[uk]=Налаштувати параметри TCP/IP
GenericName[vi]=Cấu hình thiết lập TCP/IP
GenericName[x-test]=xxConfigure TCP/IP Settingsxx
+GenericName[zh_CN]=配置 TCP/IP 设置
GenericName[zh_HK]=設定 TCP/IP 設置
GenericName[zh_TW]=設定 TCP/IP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/kpackage.desktop new/kdeadmin-3.94.0/kpackage/kpackage.desktop
--- old/kdeadmin-3.93.0/kpackage/kpackage.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/kpackage/kpackage.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -3,7 +3,6 @@
Name=KPackage
Name[af]=Kpackage
Name[eo]=Pakaĵadministrilo
-Name[ko]=KDE 꾸러미
Name[lv]=KPakotne
Name[ne]=केडीई प्याकेज
Name[pa]=ਕੇ-ਪੈਕੇਜ
@@ -31,7 +30,7 @@
GenericName[fi]=Ohjelmapakettien hallinta
GenericName[fr]=Gestionnaire de paquetages
GenericName[ga]=Bainisteoir Pacáistí
-GenericName[gl]=Xestor de Pacotes
+GenericName[gl]=Xestor de paquetes
GenericName[he]=מנהל חבילות
GenericName[hr]=Alat za upravljanje paketima
GenericName[hu]=Telepítő
@@ -69,6 +68,7 @@
GenericName[wa]=Manaedjeu di pacaedjes
GenericName[x-test]=xxPackage Managerxx
GenericName[xh]=Umphathi Wokudityaniswe kunye
+GenericName[zh_CN]=软件包管理器
GenericName[zh_HK]=套件管理程式
GenericName[zh_TW]=套件管理程式
MimeType=application/x-rpm;application/x-deb;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/managementWidget.h new/kdeadmin-3.94.0/kpackage/managementWidget.h
--- old/kdeadmin-3.93.0/kpackage/managementWidget.h 2007-08-24 21:06:56.000000000 +0200
+++ new/kdeadmin-3.94.0/kpackage/managementWidget.h 2007-10-08 09:15:59.000000000 +0200
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
// KDE headers
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/ksysv/ksysv.desktop new/kdeadmin-3.94.0/ksysv/ksysv.desktop
--- old/kdeadmin-3.93.0/ksysv/ksysv.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/ksysv/ksysv.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -4,6 +4,7 @@
Name[pt_BR]=KSysV
Name[x-test]=xxKSysVxx
GenericName=SysV-Init Editor
+GenericName[ar]=محرر SysV-Init
GenericName[be]=Рэдактар SysV-Init
GenericName[bg]=Редактор на SysV-Init
GenericName[br]=Aozer deraouiñ SysV
@@ -18,7 +19,7 @@
GenericName[fi]=SysV-Init -asetusmuokkain
GenericName[fr]=Éditeur de l'initialisation SysV
GenericName[ga]=Eagarthóir SysV-Init
-GenericName[gl]=Editor de Inicio SysV
+GenericName[gl]=Editor de inicio SysV
GenericName[he]=מנהל השירותים
GenericName[hr]=Uređivač SysV-Init
GenericName[hu]=Szolgáltatáskezelő
@@ -26,6 +27,7 @@
GenericName[it]=Editor per SysV-Init
GenericName[ja]=SystemV 起動スクリプトエディタ
GenericName[kk]=SysV-Init редакторы
+GenericName[ko]=SysV Init 편집기
GenericName[lt]=SysV-Init redaktorius
GenericName[mk]=Уредувач на SysV-Init
GenericName[nb]=SysV-init-redigering
@@ -48,6 +50,7 @@
GenericName[uk]=Редактор KSysV-Init
GenericName[vi]=SysV-Bộ sửa Init
GenericName[x-test]=xxSysV-Init Editorxx
+GenericName[zh_CN]=SysV-Init 编辑器
GenericName[zh_HK]=SysV-Init 編輯器
GenericName[zh_TW]=SysV-Init 編輯器
MimeType=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/ksysv/trash.cpp new/kdeadmin-3.94.0/ksysv/trash.cpp
--- old/kdeadmin-3.93.0/ksysv/trash.cpp 2007-04-21 20:08:10.000000000 +0200
+++ new/kdeadmin-3.94.0/ksysv/trash.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -45,7 +45,7 @@
setFrameStyle (Q3Frame::StyledPanel | Q3Frame::Sunken);
- mLabel->setPixmap(mKIL->loadIcon("user-trash", K3Icon::Desktop));
+ mLabel->setPixmap(mKIL->loadIcon("user-trash", KIconLoader::Desktop));
mPixmapWidth = mLabel->pixmap()->width();
mLabel->setGeometry(5, 7, mPixmapWidth, mPixmapWidth);
@@ -93,7 +93,7 @@
QPainter p;
p.begin(mLabel);
- p.drawPixmap( 0, 0, mKIL->loadIcon("user-trash-full", K3Icon::Desktop) );
+ p.drawPixmap( 0, 0, mKIL->loadIcon("user-trash-full", KIconLoader::Desktop) );
p.end();
mOpen = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/ksysv/x-ksysv.desktop new/kdeadmin-3.94.0/ksysv/x-ksysv.desktop
--- old/kdeadmin-3.93.0/ksysv/x-ksysv.desktop 2007-08-19 08:13:13.000000000 +0200
+++ new/kdeadmin-3.94.0/ksysv/x-ksysv.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -2,6 +2,7 @@
Encoding=UTF-8
Comment=Saved Init Configuration
Comment[af]=Gestoor Init Opstelling
+Comment[ar]=تشكيل Init المحفوظة
Comment[be]=Запісаныя настаўленні ініцыялізацыі
Comment[bg]=Настройване на инициализиращите нива
Comment[br]=Kefluniañ deraouiñ enrollet
@@ -19,7 +20,7 @@
Comment[fi]=Tallennetut Init-asetukset
Comment[fr]=Sauvegarde de la configuration de démarrage
Comment[ga]=Cumraíocht Tosaithe Sábháilte
-Comment[gl]=Configuración de Init Guardada
+Comment[gl]=Configuración de Init gardada
Comment[he]=תצורת אתחול שמורה
Comment[hr]=Spremljena Init konfiguracija
Comment[hu]=Elmentett Init beállítás
@@ -57,6 +58,7 @@
Comment[wa]=Apontiaedje d' enondaedje schapé
Comment[x-test]=xxSaved Init Configurationxx
Comment[xh]=Uqwalaselo olugciniweyo lwe Init
+Comment[zh_CN]=已保存的 Init 配置
Comment[zh_HK]=已儲存 Init 設定
Comment[zh_TW]=已儲存起始設定
Icon=ksysv
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/ksysv/x-ksysv-log.desktop new/kdeadmin-3.94.0/ksysv/x-ksysv-log.desktop
--- old/kdeadmin-3.93.0/ksysv/x-ksysv-log.desktop 2007-08-19 08:13:13.000000000 +0200
+++ new/kdeadmin-3.94.0/ksysv/x-ksysv-log.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Comment=SysV-Init Editor Log File
+Comment[ar]=ملف محرّر سجل الوقائع SysV-Init
Comment[be]=Часопіс рэдактара SysV-Init
Comment[bg]=Редактор на инициализиращите нива
Comment[ca]=Fitxer de registre de l'editor init SysV
@@ -17,7 +18,7 @@
Comment[fi]=SysV-init-editorin lokitiedosto
Comment[fr]=Journal de l'éditeur de configuration de démarrage SysV
Comment[ga]=Logchomhad don eagarthóir SysV-Init
-Comment[gl]=Ficheiro de Rexisto do Editor de Início SysV
+Comment[gl]=Ficheiro de rexisto do editor de inicio SysV
Comment[he]=קובץ רישום של מנהל השירותים
Comment[hr]=Datoteka zapisnika uređivača SysV-Init
Comment[hu]=SysV-Init (szolgáltatáskezelő) naplófájl
@@ -25,6 +26,7 @@
Comment[it]=File di log dell'editor di SysV-Init
Comment[ja]=SystemV 起動スクリプトエディタのログファイル
Comment[kk]=SysV-Init редактордың журналы
+Comment[ko]=SysV-Init 편집기 로그 파일
Comment[lt]=SysV-Init redaktoriaus žurnalas
Comment[mk]=Дневник на уредувачот на SysV-Init
Comment[nb]=Loggfil for SysV-init-redigering
@@ -51,6 +53,7 @@
Comment[vi]=Tập tin ghi lưu bộ sửa SysV-Init
Comment[wa]=Fitchî djournå di l' aspougneu po SysV-Init
Comment[x-test]=xxSysV-Init Editor Log Filexx
+Comment[zh_CN]=SysV-Init 编辑器记录文件
Comment[zh_HK]=SysV-Init 編輯器記錄檔案
Comment[zh_TW]=SysV Init 編輯器記錄檔案
Icon=ksysv
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/CMakeLists.txt new/kdeadmin-3.94.0/kuser/CMakeLists.txt
--- old/kdeadmin-3.93.0/kuser/CMakeLists.txt 2007-07-23 08:57:43.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/CMakeLists.txt 2007-10-08 09:15:59.000000000 +0200
@@ -61,7 +61,6 @@
ku_usersystem.cpp
ku_groupsystem.cpp
ku_selectconn.cpp
- sha1.cpp
)
kde4_add_kcfg_files(kuser_SRCS ku_prefs.kcfgc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_configdlg.cpp new/kdeadmin-3.94.0/kuser/ku_configdlg.cpp
--- old/kdeadmin-3.93.0/kuser/ku_configdlg.cpp 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_configdlg.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -131,7 +131,7 @@
kDebug() << "sendQuery url: " << _url.prettyUrl();
mLdif.startParsing();
- KIO::Job *job = KIO::get( _url, true, false );
+ KIO::Job *job = KIO::get( _url, KIO::Reload, KIO::HideProgressInfo );
// job->addMetaData("no-auth-prompt","true");
connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
this, SLOT( loadData( KIO::Job*, const QByteArray& ) ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_mainview.cpp new/kdeadmin-3.94.0/kuser/ku_mainview.cpp
--- old/kdeadmin-3.93.0/kuser/ku_mainview.cpp 2007-08-17 16:35:16.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_mainview.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -151,9 +151,10 @@
int index;
foreach( QModelIndex selectedindex, selectedindexes ) {
- if ( selectedindex.row() != 0 ) continue;
+ if ( selectedindex.column() != 0 ) continue;
index = userproxymodel.mapToSource(selectedindex).row();
user = users->at( index );
+ kDebug() << "Changing password for '" << user.getName() << "'";
users->createPassword( user, d.getPassword() );
user.setLastChange( now() );
user.setDisabled( false );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_mainwidget.cpp new/kdeadmin-3.94.0/kuser/ku_mainwidget.cpp
--- old/kdeadmin-3.93.0/kuser/ku_mainwidget.cpp 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_mainwidget.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -74,44 +74,44 @@
KStandardAction::preferences(this, SLOT(properties()), actionCollection());
QAction *action;
- action = new KAction(KIcon("add-user"), i18n("&Add..."), this);
- actionCollection()->addAction("add_user", action );
+ action = new KAction(KIcon("add-user"), i18n("&Add..."), this);
+ actionCollection()->addAction("add_user", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(useradd()) );
- action = new KAction(KIcon("edit-user"), i18n("&Edit..."), this);
- actionCollection()->addAction("edit_user", action );
+ action = new KAction(KIcon("edit-user"), i18n("&Edit..."), this);
+ actionCollection()->addAction("edit_user", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(useredit()) );
- action = new KAction(KIcon("delete-user"), i18n("&Delete..."), this);
- actionCollection()->addAction("delete_user", action );
+ action = new KAction(KIcon("delete-user"), i18n("&Delete..."), this);
+ actionCollection()->addAction("delete_user", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(userdel()) );
- action = new KAction(KIcon("set_password_user"), i18n("&Set Password..."), this);
- actionCollection()->addAction("set_password_user", action );
+ action = new KAction(KIcon("set_password_user"), i18n("&Set Password..."), this);
+ actionCollection()->addAction("set_password_user", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(setpwd()) );
- action = new KAction(KIcon("add_group"), i18n("&Add..."), this);
- actionCollection()->addAction("add_group", action );
+ action = new KAction(KIcon("add_group"), i18n("&Add..."), this);
+ actionCollection()->addAction("add_group", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(grpadd()) );
- action = new KAction(KIcon("edit_group"), i18n("&Edit..."), this);
- actionCollection()->addAction("edit_group", action );
+ action = new KAction(KIcon("edit_group"), i18n("&Edit..."), this);
+ actionCollection()->addAction("edit_group", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(grpedit()) );
- action = new KAction(KIcon("delete_group"), i18n("&Delete..."), this);
- actionCollection()->addAction("delete_group", action );
+ action = new KAction(KIcon("delete_group"), i18n("&Delete..."), this);
+ actionCollection()->addAction("delete_group", action );
connect( action, SIGNAL(triggered(bool)), mv, SLOT(grpdel()) );
- action = new KAction(KIcon("view-refresh"), i18n("&Reload..."), this);
- actionCollection()->addAction("reload", action );
+ action = new KAction(KIcon("view-refresh"), i18n("&Reload..."), this);
+ actionCollection()->addAction("reload", action );
connect( action, SIGNAL(triggered(bool)), this, SLOT(reload()) );
- action = new KAction(i18n("&Select Connection..."), this);
- actionCollection()->addAction("select_conn", action );
+ action = new KAction(i18n("&Select Connection..."), this);
+ actionCollection()->addAction("select_conn", action );
connect( action, SIGNAL(triggered(bool)), this, SLOT(selectconn()) );
- mShowSys = new KToggleAction(i18n("Show System Users/Groups"), this);
- actionCollection()->addAction("show_sys", mShowSys );
+ mShowSys = new KToggleAction(i18n("Show System Users/Groups"), this);
+ actionCollection()->addAction("show_sys", mShowSys );
connect( mShowSys, SIGNAL(triggered(bool)), this, SLOT(showSys(bool)) );
mShowSys->setCheckedState(KGuiItem(i18n("Hide System Users/Groups")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_misc.cpp new/kdeadmin-3.94.0/kuser/ku_misc.cpp
--- old/kdeadmin-3.93.0/kuser/ku_misc.cpp 2007-08-14 11:29:10.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_misc.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -38,6 +38,7 @@
#include
#include
+#include
#include
#include "ku_misc.h"
@@ -215,7 +216,7 @@
QByteArray genSalt( int len )
{
- QByteArray salt( len + 1, 0 );
+ QByteArray salt( len, 0 );
const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
salt[0] = set[getpid() % strlen(set)];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/kuser.desktop new/kdeadmin-3.94.0/kuser/kuser.desktop
--- old/kdeadmin-3.93.0/kuser/kuser.desktop 2007-09-06 17:47:04.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/kuser.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -2,9 +2,9 @@
Encoding=UTF-8
Name=KUser
Name[af]=Kuser
+Name[ar]=ك.مستخدم
Name[eo]=Uzantoadministrilo
Name[is]=KNotandi
-Name[ko]=KDE 사용자
Name[lv]=KLietotājs
Name[nb]=KBruker
Name[ne]=केडीई प्रयोगकर्ता
@@ -35,7 +35,7 @@
GenericName[fi]=Käyttäjienhallinta
GenericName[fr]=Gestionnaire d'utilisateurs
GenericName[ga]=Bainisteoir Úsáideora
-GenericName[gl]=Xestor de Usuários
+GenericName[gl]=Xestor de usuarios
GenericName[he]=מנהל משתמשים
GenericName[hr]=Upravljanje korisnicima
GenericName[hu]=Felhasználókezelő
@@ -74,6 +74,7 @@
GenericName[wa]=Manaedjeu d' uzeus
GenericName[x-test]=xxUser Managerxx
GenericName[xh]=Umphathi We Calendar
+GenericName[zh_CN]=用户管理程序
GenericName[zh_HK]=用戶管理員
GenericName[zh_TW]=使用者管理程式
Exec=kuser %i -caption "%c"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/kuser.kcfg new/kdeadmin-3.94.0/kuser/kuser.kcfg
--- old/kdeadmin-3.93.0/kuser/kuser.kcfg 2006-05-09 11:57:37.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/kuser.kcfg 2007-10-08 09:15:59.000000000 +0200
@@ -281,7 +281,7 @@
</entry>
<entry name="samridbase" type="Int">
<label>Algorithmic RID base</label>
- <whatsthis>This values is an offset for the algorithmic mapping from uids and gids to rids. The default (and minimum) value is 1000, it must be even, and the LDAP database and smb.conf must store the same values.</whatsthis>
+ <whatsthis>This value is an offset for the algorithmic mapping from uids and gids to rids. The default (and minimum) value is 1000, it must be even, and the LDAP database and smb.conf must store the same values.</whatsthis>
<default>1000</default>
</entry>
<entry name="samloginscript" type="String">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_user.cpp new/kdeadmin-3.94.0/kuser/ku_user.cpp
--- old/kdeadmin-3.93.0/kuser/ku_user.cpp 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_user.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -21,7 +21,6 @@
#include "globals.h"
#include
-#include
#include
#include
#include
@@ -332,26 +331,6 @@
return 0;
}
-int KU_User::removeProcesses()
-{
- // be paranoid -- kill all processes owned by that user, if not root.
-
- if (d->UID != 0)
- switch (fork()) {
- case 0:
- setuid(d->UID);
- kill(-1, 9);
- _exit(0);
- break;
- case -1:
- KMessageBox::error( 0,
- i18n("Cannot fork while trying to kill processes for uid %1.", d->UID) );
- break;
- }
-
- return 0;
-}
-
KU_Users::KU_Users(KU_PrefsBase *cfg)
{
mCfg = cfg;
@@ -438,9 +417,7 @@
}
if ( user->getDeleteMailBox() )
user->removeMailBox();
-/*
- user->removeProcesses();
-*/
+
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_userldap.cpp new/kdeadmin-3.94.0/kuser/ku_userldap.cpp
--- old/kdeadmin-3.93.0/kuser/ku_userldap.cpp 2007-09-02 12:44:34.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/ku_userldap.cpp 2007-10-08 09:15:59.000000000 +0200
@@ -18,10 +18,10 @@
#include <QByteArray>
#include <QLabel>
+#include <QCryptographicHash>
#include
#include
-#include
#include
#include
#include
@@ -30,7 +30,6 @@
#include "ku_userldap.h"
#include "ku_misc.h"
-#include "sha1.h"
KU_UserLDAP::KU_UserLDAP(KU_PrefsBase *cfg) : KU_Users( cfg )
{
@@ -281,45 +280,35 @@
user.setPwd( "{CRYPT}" + encryptPass( password, false ) );
break;
case KU_PrefsBase::EnumLdappasswordhash::MD5: {
- KMD5 md5( password.toUtf8() );
- user.setPwd( "{MD5}" + md5.base64Digest() );
+ QCryptographicHash md5(QCryptographicHash::Md5);
+ md5.addData( password.toUtf8() );
+ user.setPwd( "{MD5}" + md5.result().toBase64() );
break;
}
case KU_PrefsBase::EnumLdappasswordhash::SMD5: {
- QByteArray salt = genSalt( 4 );
+ QCryptographicHash md5(QCryptographicHash::Md5);
+ QByteArray salt = genSalt( 8 );
QByteArray pwd = password.toUtf8() + salt;
- KMD5::Digest digest;
- QByteArray hash(20, 0);
- KMD5 md5( pwd );
- md5.rawDigest( digest );
- memcpy( hash.data(), digest, 16 );
- memcpy( &(hash.data()[16]), salt.data(), 4 );
- user.setPwd( "{SMD5}" + KCodecs::base64Encode( hash ) );
+ md5.addData( pwd );
+ user.setPwd( "{SMD5}" + (md5.result() + salt).toBase64() );
break;
}
case KU_PrefsBase::EnumLdappasswordhash::SHA: {
- struct sha1_ctx ctx;
- QByteArray hash(20, 0);
+ QCryptographicHash sha1(QCryptographicHash::Sha1);
- sha1_init( &ctx );
- sha1_update( &ctx, (const quint8*) password.toUtf8().data(),
- password.toUtf8().length() );
- sha1_final( &ctx, (quint8*) hash.data() );
- user.setPwd( "{SHA}" + KCodecs::base64Encode( ( hash ) ) );
+ sha1.addData( password.toUtf8() );
+ user.setPwd( "{SHA}" + sha1.result().toBase64() );
break;
}
case KU_PrefsBase::EnumLdappasswordhash::SSHA: {
- struct sha1_ctx ctx;
- QByteArray hash(24, 0);
- QByteArray salt = genSalt( 4 );
+ QCryptographicHash sha1(QCryptographicHash::Sha1);
+
+ QByteArray salt = genSalt( 8 );
QByteArray pwd = password.toUtf8() + salt;
- sha1_init( &ctx );
- sha1_update( &ctx, (const quint8*) pwd.data(), pwd.length() );
- sha1_final( &ctx, (quint8*) hash.data() );
- memcpy( &(hash.data()[ 20 ]), salt.data(), 4 );
- user.setPwd( "{SSHA}" + KCodecs::base64Encode( ( hash ) ) );
+ sha1.addData( pwd );
+ user.setPwd( "{SSHA}" + (sha1.result() + salt).toBase64() );
break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/sha1.cpp new/kdeadmin-3.94.0/kuser/sha1.cpp
--- old/kdeadmin-3.93.0/kuser/sha1.cpp 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/sha1.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,178 +0,0 @@
-/*
- * Cryptographic API.
- *
- * SHA1 Secure Hash Algorithm.
- *
- * Derived from cryptoapi implementation, adapted for in-place
- * scatterlist interface. Originally based on the public domain
- * implementation written by Steve Reid.
- *
- * Copyright (c) Alan Smithee.
- * Copyright (c) Andrew McDonald
- * Copyright (c) Jean-Francois Dive
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-
-#include "sha1.h"
-
-#include
-
-#include
-
-#define SHA1_DIGEST_SIZE 20
-#define SHA1_HMAC_BLOCK_SIZE 64
-
-static inline quint32 rol(quint32 value, quint32 bits)
-{
- return (((value) << (bits)) | ((value) >> (32 - (bits))));
-}
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-# define blk0(i) block32[i]
-
-#define blk(i) (block32[i&15] = rol(block32[(i+13)&15]^block32[(i+8)&15] \
- ^block32[(i+2)&15]^block32[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5); \
- w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5); \
- w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5); \
- w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-static void sha1_transform(quint32 *state, const quint8 *in)
-{
- quint32 a, b, c, d, e;
- quint32 block32[16];
-
- /* convert/copy data to workspace */
- for (a = 0; a < sizeof(block32)/sizeof(quint32); a++)
-#ifdef WORDS_BIGENDIAN
- block32[a] = ((const quint32 *)in)[a];
-#else
- block32[a] = ((const quint32 *)in)[a] >> 24 |
- (((const quint32 *)in)[a] >> 8 & 0x0000ff00) |
- (((const quint32 *)in)[a] << 8 & 0x00ff0000) |
- (((const quint32 *)in)[a] << 24);
-#endif
- /* Copy context->state[] to working vars */
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
-
- /* 4 rounds of 20 operations each. Loop unrolled. */
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
- /* Add the working vars back into context.state[] */
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
- /* Wipe variabes */
- a = b = c = d = e = 0;
- memset (block32, 0x00, sizeof block32);
-}
-
-void sha1_init(void *ctx)
-{
- struct sha1_ctx *sctx = (sha1_ctx*) ctx;
- static const struct sha1_ctx initstate = {
- 0,
- { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },
- { 0, }
- };
-
- *sctx = initstate;
-}
-
-void sha1_update(void *ctx, const quint8 *data, unsigned int len)
-{
- struct sha1_ctx *sctx = (sha1_ctx*) ctx;
- unsigned int i, j;
-
- j = (sctx->count >> 3) & 0x3f;
- sctx->count += len << 3;
-
- if ((j + len) > 63) {
- memcpy(&sctx->buffer[j], data, (i = 64-j));
- sha1_transform(sctx->state, sctx->buffer);
- for ( ; i + 63 < len; i += 64) {
- sha1_transform(sctx->state, &data[i]);
- }
- j = 0;
- }
- else i = 0;
- memcpy(&sctx->buffer[j], &data[i], len - i);
-}
-
-
-/* Add padding and return the message digest. */
-void sha1_final(void* ctx, quint8 *out)
-{
- struct sha1_ctx *sctx = (sha1_ctx*) ctx;
- quint32 i, j, index, padlen;
- quint64 t;
- quint8 bits[8] = { 0, };
- static const quint8 padding[64] = { 0x80, };
-
- t = sctx->count;
- bits[7] = 0xff & t; t>>=8;
- bits[6] = 0xff & t; t>>=8;
- bits[5] = 0xff & t; t>>=8;
- bits[4] = 0xff & t; t>>=8;
- bits[3] = 0xff & t; t>>=8;
- bits[2] = 0xff & t; t>>=8;
- bits[1] = 0xff & t; t>>=8;
- bits[0] = 0xff & t;
-
- /* Pad out to 56 mod 64 */
- index = (sctx->count >> 3) & 0x3f;
- padlen = (index < 56) ? (56 - index) : ((64+56) - index);
- sha1_update(sctx, padding, padlen);
-
- /* Append length */
- sha1_update(sctx, bits, sizeof bits);
-
- /* Store state in digest */
- for (i = j = 0; i < 5; i++, j += 4) {
- quint32 t2 = sctx->state[i];
- out[j+3] = t2 & 0xff; t2>>=8;
- out[j+2] = t2 & 0xff; t2>>=8;
- out[j+1] = t2 & 0xff; t2>>=8;
- out[j ] = t2 & 0xff;
- }
-
- /* Wipe context */
- memset(sctx, 0, sizeof *sctx);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/sha1.h new/kdeadmin-3.94.0/kuser/sha1.h
--- old/kdeadmin-3.93.0/kuser/sha1.h 2005-10-07 20:09:15.000000000 +0200
+++ new/kdeadmin-3.94.0/kuser/sha1.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-/*
- * Cryptographic API.
- *
- * SHA1 Secure Hash Algorithm.
- *
- * Derived from cryptoapi implementation, adapted for in-place
- * scatterlist interface. Originally based on the public domain
- * implementation written by Steve Reid.
- *
- * Copyright (c) Alan Smithee.
- * Copyright (c) Andrew McDonald
- * Copyright (c) Jean-Francois Dive
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-
-#ifndef _SHA1_H_
-#define _SHA1_H_
-
-#include
-
-struct sha1_ctx {
- quint64 count;
- quint32 state[5];
- quint8 buffer[64];
-};
-
-void sha1_init(void *ctx);
-void sha1_update(void *ctx, const quint8 *data, unsigned int len);
-void sha1_final(void* ctx, quint8 *out);
-
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/lilo-config/kde/kcontrol.cpp new/kdeadmin-3.94.0/lilo-config/kde/kcontrol.cpp
--- old/kdeadmin-3.93.0/lilo-config/kde/kcontrol.cpp 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/lilo-config/kde/kcontrol.cpp 2007-10-03 13:47:32.000000000 +0200
@@ -38,12 +38,15 @@
#include
#include
#include
-#include
+#include
+#include
-typedef KGenericFactory LiloFactory;
-K_EXPORT_COMPONENT_FACTORY( lilo, LiloFactory("lilo") )
-KControl::KControl(QWidget *parent,const QStringList &)
+K_PLUGIN_FACTORY(LiloFactory, registerPlugin<KControl>();)
+K_EXPORT_PLUGIN(LiloFactory("lilo"))
+
+
+KControl::KControl(QWidget *parent,const QVariantList &)
: KCModule(LiloFactory::componentData(), parent)
{
QVBoxLayout *layout=new QVBoxLayout(this);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/lilo-config/kde/kcontrol.h new/kdeadmin-3.94.0/lilo-config/kde/kcontrol.h
--- old/kdeadmin-3.93.0/lilo-config/kde/kcontrol.h 2007-08-19 22:07:11.000000000 +0200
+++ new/kdeadmin-3.94.0/lilo-config/kde/kcontrol.h 2007-10-03 13:47:32.000000000 +0200
@@ -38,7 +38,7 @@
class KControl: public KCModule {
Q_OBJECT
public:
- explicit KControl(QWidget * parent = 0, const QStringList &list = QStringList() );
+ explicit KControl(QWidget * parent = 0, const QVariantList &list = QVariantList() );
void load();
void save();
void defaults();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/lilo-config/kde/lilo.desktop new/kdeadmin-3.94.0/lilo-config/kde/lilo.desktop
--- old/kdeadmin-3.93.0/lilo-config/kde/lilo.desktop 2007-08-19 08:13:13.000000000 +0200
+++ new/kdeadmin-3.94.0/lilo-config/kde/lilo.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -14,6 +14,7 @@
Name=Boot Manager (LILO)
Name[af]=Boot Bestuurder (Lilo)
+Name[ar]=مدير إقلاع النظام (LILO)
Name[be]=Кіраўнік загрузкі LILO
Name[bg]=Стартиране
Name[br]=C'Harger loc'hañ (LILO)
@@ -31,7 +32,7 @@
Name[fi]=Käynnistyksenhallinta (LILO)
Name[fr]=Gestionnaire de démarrage (LILO)
Name[ga]=Bainisteoir Tosaithe (LILO)
-Name[gl]=Xestor de Arranque (LILO)
+Name[gl]=Xestor de arranque (LILO)
Name[he]=מנהל האתחול (LILO)
Name[hr]=Upravljanje pokretanjem (LILO)
Name[hu]=Rendszerindító (LILO)
@@ -39,13 +40,13 @@
Name[it]=Gestore di avvio (LILO)
Name[ja]=ブートマネージャ (LILO)
Name[kk]=Жүктеуіш (LILO)
-Name[ko]=부트 관리자 (리로)
+Name[ko]=부트 관리자 (LILO)
Name[lt]=Užkrovos tvarkyklė (LILO)
Name[lv]=Sāknēšanas Menedžeris (LILO)
Name[ms]=Pengurus Boot (LILO)
Name[nb]=Oppstartsbehandler (LILO)
Name[nds]=Systeemstart-Pleger (LILO)
-Name[ne]=बुट प्रबन्धक (एलआईएलओ)
+Name[ne]=बुट प्रबन्धक (LILO)
Name[nl]=Opstartbeheerder (LILO)
Name[nn]=Oppstartshandsamar (LILO)
Name[pa]=ਬੂਟ ਪਰਬੰਧਕ (LILO)
@@ -68,10 +69,12 @@
Name[wa]=Apontiaedje del enondrece (LILO)
Name[x-test]=xxBoot Manager (LILO)xx
Name[xh]=Umphathi wesiNgxobo (LILO)
+Name[zh_CN]=引导管理器(LILO)
Name[zh_HK]=開機管理員(LILO)
Name[zh_TW]=開機啟動管理程式(LILO)
Comment=Configure LILO (the Linux boot manager)
Comment[af]=Konfigureer Lilo (die Linux boot bestuurder)
+Comment[ar]=اضبط LILO (مدير إقلاع نظام لينِكس)
Comment[be]=Наставіць LILO (кіраўнік загрузкі Linux)
Comment[bg]=Графично настройване на първоначалното зареждането на Линукс
Comment[br]=Kefluniañ LILO (ar c'harger loc'hañ evit Linux)
@@ -97,12 +100,13 @@
Comment[it]=Configura LILO (il gestore dell'avvio di Linux)
Comment[ja]=LILO (Linux ブートマネージャ) の設定
Comment[kk]=LILO (Linux жүктеуішін) баптауы
+Comment[ko]=LILO(리눅스 부트 관리자) 설정
Comment[lt]=Konfigūruoti LILO (Linux užkrovos tvarkyklę)
Comment[mk]=Конфигурирајте го LILO (менаџерот за подигање на Линукс)
Comment[ms]=Selaraskan LILO (pengurus boot Linux)
Comment[nb]=Her kan du sette opp LILO (Linux oppstartssystem)
Comment[nds]=LILO (Systeemstart-Pleger vun Linux) instellen
-Comment[ne]=एलआईएलओ कन्फिगर गर्नुहोस् (लिनक्स बुट प्रबन्धक)
+Comment[ne]=LILO कन्फिगर गर्नुहोस् (लिनक्स बुट प्रबन्धक)
Comment[nl]=Lilo (Linux Opstartmanager) instellen
Comment[nn]=LILO-oppsett (Linux-oppstartssystemet)
Comment[pa]=LILO ਸੰਰਚਨਾ(ਲੀਨਕਸ ਬੂਟ ਮੈਨੇਜਰ)
@@ -125,6 +129,7 @@
Comment[wa]=Chal vos ploz apontyî LILO (l' enondrece Linux)
Comment[x-test]=xxConfigure LILO (the Linux boot manager)xx
Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux)
+Comment[zh_CN]=配置 LILO (Linux 引导管理程序)
Comment[zh_HK]=設定 LILO (Linux 的開機管理員)
Comment[zh_TW]=你可在此設定 LILO (Linux 的開機管理程式)
@@ -143,13 +148,14 @@
Keywords[fi]=lilo,boot,bootup,käynnistyksenhallinta,linux,MBR,käynnistys,käynnistä
Keywords[fr]=lilo, boot, démarrage, gestionnaire de démarrage, linux, autre OS, MBR
Keywords[ga]=lilo,tosaigh,tosú,bainisteoir tosaithe,linux,CO eile,MBR,tosú,tús
+Keywords[gl]=lilo,arranque,bootup,xestor de arranque,linux,Outros SO,MBR,inicio,iniciar
Keywords[he]=הפעלה,התחלה,MBR,אתחול,מנהל אתחול,לינוקס,מערכות הפעלה אחרות,רשומת אתחול ראשית,lilo
Keywords[hr]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,pokretanje,početak,počinjanje,ostali OS,upravitelj pokretanjem
Keywords[hu]=lilo,boot,rendszerindítás,rendszerindítás-kezelő,Linux,más operációs rendszerek,MBR,indulás,start
Keywords[is]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,ræsa
Keywords[it]=lilo,boot,boot manager,linux,altri sistemi operativi,MBR,avvio,gestore avvio
Keywords[ja]=lilo,ブート,ブートマネージャ,linux,他のOS,MBR,起動,開始
-Keywords[ko]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,리로,부트,부팅,부트 관리자,리눅스,다른 OS,다른 운영체제,시작
+Keywords[ko]=lilo,부팅,부트로더,리눅스,MBR,시작
Keywords[lt]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,užkrova,krovimasis,kitos OS
Keywords[lv]=lilo,sāknēt,sāknēšana,sāknēšanas menedžeris,linux,Citas OS,MBR,startēšana,startēt
Keywords[mk]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,подигање,менаџер,линукс,старт
@@ -176,5 +182,6 @@
Keywords[wa]=LILO,boot,bootup,linux,Ôtes SO,MBR,startup,start,enondrece,enondaedje
Keywords[x-test]=xxlilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,startxx
Keywords[xh]=lilo,isingxobo,faka isingxobo, uphathi wesingxobo,linux,Ezinye OS,MBR,faka isiqalo,qala
+Keywords[zh_CN]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,引导,引导管理器,其它操作系统,主引导记录,启动
Categories=Qt;KDE;X-KDE-settings-system;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/strigi-analyzer/rpm/kfile_rpm.desktop new/kdeadmin-3.94.0/strigi-analyzer/rpm/kfile_rpm.desktop
--- old/kdeadmin-3.93.0/strigi-analyzer/rpm/kfile_rpm.desktop 2007-08-19 08:13:13.000000000 +0200
+++ new/kdeadmin-3.94.0/strigi-analyzer/rpm/kfile_rpm.desktop 2007-10-03 13:47:32.000000000 +0200
@@ -3,6 +3,7 @@
Type=Service
Name=RPM Stats
Name[af]=Rpm Statistiek
+Name[ar]=إحصائيَات RPM
Name[be]=Статыстыка RPM
Name[br]=Stadegoù gant RPM
Name[ca]=L'estat dels RPM
@@ -49,6 +50,7 @@
Name[vi]=Thống kê RPM
Name[wa]=Sitatistikes RPM
Name[x-test]=xxRPM Statsxx
+Name[zh_CN]=RPM 统计
Name[zh_HK]=RPM 統計
Name[zh_TW]=RPM 統計
ServiceTypes=KFilePlugin
++++++ _upstream ++++++
--- KDE/kdeadmin4/_upstream 2007-09-13 14:46:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeadmin4/_upstream 2007-10-09 14:41:51.000000000 +0200
@@ -1,6 +1,6 @@
<upstream>
<source>
- <file archive='tar' compress='bzip2'>kdeadmin-3.93.0.tar.bz2</file>
+ <file archive='tar' compress='bzip2'>kdeadmin-3.94.0.tar.bz2</file>
<svn>
<url>svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeadmin</url>
<destdir/>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org