[Pkg-kde-commits] rev 1252 - in branches/kde-3.4.0/packages/kdeutils/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-07-06 04:09:41 +0000 (Wed, 06 Jul 2005)
New Revision: 1252

Added:
   branches/kde-3.4.0/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
Modified:
   branches/kde-3.4.0/packages/kdeutils/debian/changelog
Log:
Add a patch to disable the warning that klaptop_acpi_helper's
checkusm isn't right, since this warning always appears.

Note that when making klaptop_ac... SUID in kcontrol, the change
isn't permanent, so every upgrade overwrites the file's permissions.
We really need a debconf question here. TODO ???


Modified: branches/kde-3.4.0/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-07-06 04:07:28 UTC (rev 1251)
+++ branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-07-06 04:09:41 UTC (rev 1252)
@@ -1,11 +1,19 @@
-kdeutils (4:3.4.1-2) experimental; urgency=low
+kdeutils (4:3.4.1-1+SVN) UNRELEASED; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * change kdessh depends : ssh becomes (open)ssh-client.  (Closes: #315045)
+  * Change kdessh depends: ssh becomes (open)ssh-client. (Closes: #315045)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 14 Jun 2005 20:27:54 +0200
+  +++ Changes by Christopher Martin:
 
+  * Add a patch to disable klaptopdaemon's warning concerning
+    klaptop_acpi_helper's checksum when using the provided dialog to make
+    it SUID, since this warning always and erroneously states that the
+    checksum has changed since installation.
+    (Closes: #247864).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  3 Jul 2005 21:25:30 +0200
+
 kdeutils (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.

Added: branches/kde-3.4.0/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2005-07-06 04:07:28 UTC (rev 1251)
+++ branches/kde-3.4.0/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2005-07-06 04:09:41 UTC (rev 1252)
@@ -0,0 +1,34 @@
+--- kde.orig/klaptopdaemon/apm.cpp
++++ kde.new/klaptopdaemon/apm.cpp
+@@ -187,14 +187,6 @@
+ 	unsigned long len, crc;
+ 	QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+ 	checkcrc(helper.latin1(), len, crc);
+-	if (len != file_len || crc != file_crc) {
+-		QString str(i18n("The %1 application does not seem to have "
+-					"the same size or checksum as when it was compiled we do NOT recommend "
+-					"you proceed with making it setuid-root without further investigation").arg(helper));
+-		int rc = KMessageBox::questionYesNo(0, str, i18n("KLaptopDaemon"), KStdGuiItem::cancel(), KStdGuiItem::cont(), "");
+-		if (rc != KMessageBox::No) 
+-			return;
+-	}
+ 
+ 	QString kdesu = KStandardDirs::findExe("kdesu");
+ 	if (!kdesu.isEmpty()) {
+--- kde.orig/klaptopdaemon/acpi.cpp
++++ kde.new/klaptopdaemon/acpi.cpp
+@@ -165,14 +165,6 @@
+ 	unsigned long len, crc;
+ 	QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+ 	checkcrc(QFile::encodeName(helper), len, crc);
+-	if (len != file_len || crc != file_crc) {
+-		QString str(i18n("The %1 application does not seem to have "
+-					"the same size or checksum as when it was compiled we do NOT recommend "
+-					"you proceed with making it setuid-root without further investigation").arg(helper));
+-		int rc = KMessageBox::questionYesNo(0, str, i18n("KLaptopDaemon"), KStdGuiItem::cancel(), KStdGuiItem::cont(), "");
+-		if (rc != KMessageBox::No) 
+-			return;
+-	}
+ 
+ 	QString kdesu = KStandardDirs::findExe("kdesu");
+ 	if (!kdesu.isEmpty()) {