pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/kdeedu3 Fix for http://www.kde.org/info/security/...
details: https://anonhg.NetBSD.org/pkgsrc/rev/487d27ee2908
branches: trunk
changeset: 489376:487d27ee2908
user: markd <markd%pkgsrc.org@localhost>
date: Sun Feb 20 11:31:11 2005 +0000
description:
Fix for http://www.kde.org/info/security/advisory-20050215-1.txt.
Bump PKGREVISION.
diffstat:
misc/kdeedu3/Makefile | 3 +-
misc/kdeedu3/distinfo | 24 +++-
misc/kdeedu3/patches/patch-ac | 102 ++++++++++++++++
misc/kdeedu3/patches/patch-ad | 121 +++++++++++++++++++
misc/kdeedu3/patches/patch-ae | 48 +++++++
misc/kdeedu3/patches/patch-af | 22 +++
misc/kdeedu3/patches/patch-ag | 40 ++++++
misc/kdeedu3/patches/patch-ah | 12 +
misc/kdeedu3/patches/patch-ai | 119 +++++++++++++++++++
misc/kdeedu3/patches/patch-aj | 254 ++++++++++++++++++++++++++++++++++++++++
misc/kdeedu3/patches/patch-ak | 12 +
misc/kdeedu3/patches/patch-al | 135 +++++++++++++++++++++
misc/kdeedu3/patches/patch-am | 144 +++++++++++++++++++++++
misc/kdeedu3/patches/patch-an | 51 ++++++++
misc/kdeedu3/patches/patch-ao | 111 +++++++++++++++++
misc/kdeedu3/patches/patch-ap | 13 ++
misc/kdeedu3/patches/patch-aq | 33 +++++
misc/kdeedu3/patches/patch-ar | 184 +++++++++++++++++++++++++++++
misc/kdeedu3/patches/patch-as | 21 +++
misc/kdeedu3/patches/patch-at | 41 ++++++
misc/kdeedu3/patches/patch-au | 17 ++
misc/kdeedu3/patches/patch-av | 93 ++++++++++++++
misc/kdeedu3/patches/patch-aw | 261 ++++++++++++++++++++++++++++++++++++++++++
misc/kdeedu3/patches/patch-ax | 12 +
24 files changed, 1871 insertions(+), 2 deletions(-)
diffs (truncated from 1979 to 300 lines):
diff -r 3e45408f892b -r 487d27ee2908 misc/kdeedu3/Makefile
--- a/misc/kdeedu3/Makefile Sun Feb 20 11:05:28 2005 +0000
+++ b/misc/kdeedu3/Makefile Sun Feb 20 11:31:11 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/10/13 12:34:51 markd Exp $
+# $NetBSD: Makefile,v 1.29 2005/02/20 11:31:11 markd Exp $
DISTNAME= kdeedu-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop
diff -r 3e45408f892b -r 487d27ee2908 misc/kdeedu3/distinfo
--- a/misc/kdeedu3/distinfo Sun Feb 20 11:05:28 2005 +0000
+++ b/misc/kdeedu3/distinfo Sun Feb 20 11:31:11 2005 +0000
@@ -1,6 +1,28 @@
-$NetBSD: distinfo,v 1.21 2004/12/10 06:19:47 markd Exp $
+$NetBSD: distinfo,v 1.22 2005/02/20 11:31:11 markd Exp $
SHA1 (kdeedu-3.3.2.tar.bz2) = 244399f073a5dea34d5e351871dbcfaa747b3eec
Size (kdeedu-3.3.2.tar.bz2) = 22069753 bytes
SHA1 (patch-aa) = d66c0a9fb5cf367b65c845e4a46b8353dd033cfc
SHA1 (patch-ab) = 6f7122f34d2894489b933d90644022f71192b023
+SHA1 (patch-ac) = 4a46edad3da8e292e5ee277bb82a87126df8d376
+SHA1 (patch-ad) = 33e331c2350466ef328f68569cdf0c4b77676a1c
+SHA1 (patch-ae) = 39278384caa77853ee1870e565c9fcd1946c670e
+SHA1 (patch-af) = c3277f0c6bda68eb48709bccaaf786f46c694503
+SHA1 (patch-ag) = 8f9962e26ae3d8e2cf1b8ea23a3a3d98645cfe8a
+SHA1 (patch-ah) = 55eebedd0fd7ba814573a38ab47711654e45c72b
+SHA1 (patch-ai) = a59e4e3cd0b4004c3064209a76a25d26ecf95c30
+SHA1 (patch-aj) = 79fb25f03bd97dfd140ecd4ed6c6ce0234393283
+SHA1 (patch-ak) = 62476e581941bb80fbac04d4f30be4b8ae88db1b
+SHA1 (patch-al) = 50e57ee4d0d930defd1d0c4aaaeb84b99e39600c
+SHA1 (patch-am) = f51920cd99c8478271bf4b336104593cb28906bb
+SHA1 (patch-an) = 841f920931ab0eae1fea385c4674bc326f07a14d
+SHA1 (patch-ao) = 594b2e210aa784951ce02a7072d5c85f570e7527
+SHA1 (patch-ap) = f665144c281b79f27ceebd0650e2822afd0c8c78
+SHA1 (patch-aq) = 924ab74ef90738afc7bbaccabb635bdaba138c19
+SHA1 (patch-ar) = 35253305bd8edbccbf8979c013f8f9a4887ca528
+SHA1 (patch-as) = 3595ff48db9cd3485729c98371d42597cc1cb929
+SHA1 (patch-at) = 95e18d6be3dc1bab88f1eee68bec87d09d77d0a2
+SHA1 (patch-au) = 27b68ee3d508add5746600d41c485be4749b0eee
+SHA1 (patch-av) = eb41ed317f91f0bc41447c59c9548c4a66d8acc0
+SHA1 (patch-aw) = d8c538a1be434ee5b3df98589849f9a2b9efd116
+SHA1 (patch-ax) = cf0b8c94e535a8b48c25d78a66dea4ec4b197734
diff -r 3e45408f892b -r 487d27ee2908 misc/kdeedu3/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdeedu3/patches/patch-ac Sun Feb 20 11:31:11 2005 +0000
@@ -0,0 +1,102 @@
+$NetBSD: patch-ac,v 1.1 2005/02/20 11:31:11 markd Exp $
+
+--- kstars/kstars/devicemanager.cpp.orig 2004-07-18 05:52:56.000000000 +1200
++++ kstars/kstars/devicemanager.cpp
+@@ -17,6 +17,7 @@
+ #include "indiproperty.h"
+ #include "indigroup.h"
+ #include "indidevice.h"
++#include "indi/indicom.h"
+ #include "kstars.h"
+ #include "kstarsdatetime.h"
+
+@@ -136,50 +137,51 @@ bool DeviceManager::indiConnect(QString
+ void DeviceManager::dataReceived()
+ {
+ char ibuf[32]; /* not so much user input lags */
+- char msg[1024];
++ char errmsg[ERRMSG_SIZE];
+ int i, nr;
+
+ /* read INDI command */
+- nr = read (serverFD, ibuf, sizeof(ibuf));
++ nr = read (serverFD, ibuf, sizeof(ibuf)-1);
+ if (nr <= 0)
+ {
+ if (nr < 0)
+- sprintf (msg, "INDI: input error.");
++ strcpy (errmsg, "INDI: input error.");
+ else
+- sprintf (msg, "INDI: agent closed connection.");
++ strcpy (errmsg, "INDI: agent closed connection.");
+
+
+ tcflush(serverFD, TCIFLUSH);
+ sNotifier->disconnect();
+ close(serverFD);
+ parent->removeDeviceMgr(mgrID);
+- KMessageBox::error(0, QString(msg));
++ KMessageBox::error(0, QString::fromLatin1(errmsg));
+
+ return;
+ }
+
++ ibuf[ sizeof( ibuf )-1 ] = '\0';
++
+ /* process each char */
+ for (i = 0; i < nr; i++)
+ {
+ if (!XMLParser)
+ return;
+
+- XMLEle *root = readXMLEle (XMLParser, (int)ibuf[i], msg);
++ XMLEle *root = readXMLEle (XMLParser, (int)ibuf[i], errmsg);
+ if (root)
+ {
+ //prXMLEle (stdout, root, 0);
+- if (dispatchCommand(root, msg) < 0)
++ if (dispatchCommand(root, errmsg) < 0)
+ {
+- //kdDebug() << msg << endl;
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", errmsg);
+ prXMLEle (stdout, root, 0);
+ }
+
+ delXMLEle (root);
+ }
+- else if (msg[0])
++ else if (*errmsg)
+ {
+- kdDebug() << msg << endl;
++ kdDebug() << errmsg << endl;
+ }
+ }
+ }
+@@ -271,7 +273,7 @@ int DeviceManager::removeDevice(QString
+ }
+ }
+
+- sprintf(errmsg, "Device %s not found" , devName.ascii());
++ snprintf(errmsg, ERRMSG_SIZE, "Device %.32s not found" , devName.ascii());
+ return -1;
+ }
+
+@@ -284,7 +286,7 @@ INDI_D * DeviceManager::findDev (QString
+ return (indi_dev.at(i));
+ }
+
+- sprintf (errmsg, "INDI: no such device %s", devName.ascii());
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: no such device %.32s", devName.ascii());
+ kdDebug() << errmsg;
+
+ return NULL;
+@@ -342,7 +344,7 @@ INDI_D * DeviceManager::findDev (XMLEle
+ return (addDevice (root, errmsg));
+
+
+- sprintf (errmsg, "INDI: <%s> no such device %s", tagXMLEle(root), dn);
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.32s> no such device %.32s", tagXMLEle(root), dn);
+ return NULL;
+ }
+
diff -r 3e45408f892b -r 487d27ee2908 misc/kdeedu3/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdeedu3/patches/patch-ad Sun Feb 20 11:31:11 2005 +0000
@@ -0,0 +1,121 @@
+$NetBSD: patch-ad,v 1.1 2005/02/20 11:31:11 markd Exp $
+
+--- kstars/kstars/indidevice.cpp.orig 2004-06-25 21:10:00.000000000 +1200
++++ kstars/kstars/indidevice.cpp
+@@ -172,7 +172,7 @@ int INDI_D::setAnyCmd (XMLEle *root, cha
+ pp = findProp (valuXMLAtt(ap));
+ if (!pp)
+ {
+- sprintf (errmsg,"INDI: <%s> device %s has no property named %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.32s> device %.32s has no property named %.64s",
+ tagXMLEle(root), name.ascii(), valuXMLAtt(ap));
+ return (-1);
+ }
+@@ -197,7 +197,7 @@ int INDI_D::setValue (INDI_P *pp, XMLEle
+ pp->drawLt (pp->state);
+ else
+ {
+- sprintf (errmsg, "INDI: <%s> bogus state %s for %s %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> bogus state %.64s for %.64s %.64s",
+ tagXMLEle(root), valuXMLAtt(ap), name.ascii(), pp->name.ascii());
+ return (-1);
+ }
+@@ -265,7 +265,7 @@ int INDI_D::setTextValue (INDI_P *pp, XM
+
+ if (!lp)
+ {
+- sprintf(errmsg, "Error: unable to find element '%s' in property '%s'", elementName.ascii(), pp->name.ascii());
++ snprintf(errmsg, ERRMSG_SIZE, "Error: unable to find element '%.64s' in property '%.64s'", elementName.ascii(), pp->name.ascii());
+ return (-1);
+ }
+
+@@ -360,7 +360,7 @@ int INDI_D::setLabelState (INDI_P *pp, X
+ /* no name */
+ if (!ap)
+ {
+- sprintf (errmsg, "INDI: <%s> %s %s %s requires name",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> %.64s %.64s %.64s requires name",
+ tagXMLEle(root), name.ascii(), pp->name.ascii(), tagXMLEle(ep));
+ return (-1);
+ }
+@@ -368,7 +368,7 @@ int INDI_D::setLabelState (INDI_P *pp, X
+ if ((islight && crackLightState (pcdataXMLEle(ep), &state) < 0)
+ || (!islight && crackSwitchState (pcdataXMLEle(ep), &state) < 0))
+ {
+- sprintf (errmsg, "INDI: <%s> unknown state %s for %s %s %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> unknown state %.64s for %.64s %.64s %.64s",
+ tagXMLEle(root), pcdataXMLEle(ep), name.ascii(), pp->name.ascii(), tagXMLEle(ep));
+ return (-1);
+ }
+@@ -379,7 +379,7 @@ int INDI_D::setLabelState (INDI_P *pp, X
+
+ if (!lp)
+ {
+- sprintf (errmsg,"INDI: <%s> %s %s has no choice named %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> %.64s %.64s has no choice named %.64s",
+ tagXMLEle(root), name.ascii(), pp->name.ascii(), valuXMLAtt(ap));
+ return (-1);
+ }
+@@ -409,7 +409,7 @@ int INDI_D::setLabelState (INDI_P *pp, X
+ {
+ if (menuChoice)
+ {
+- sprintf(errmsg, "INDI: <%s> %s %s has multiple ON states", tagXMLEle(root), name.ascii(), pp->name.ascii());
++ snprintf(errmsg, ERRMSG_SIZE, "INDI: <%.64s> %.64s %.64s has multiple ON states", tagXMLEle(root), name.ascii(), pp->name.ascii());
+ return (-1);
+ }
+ menuChoice = 1;
+@@ -470,7 +470,7 @@ INDI_P * INDI_D::addProperty (XMLEle *ro
+
+ if (findProp (valuXMLAtt(ap)))
+ {
+- sprintf (errmsg, "INDI: <%s %s %s> already exists.\n", tagXMLEle(root),
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s %.64s %.64s> already exists.\n", tagXMLEle(root),
+ name.ascii(), valuXMLAtt(ap));
+ return NULL;
+ }
+@@ -492,7 +492,7 @@ INDI_P * INDI_D::addProperty (XMLEle *ro
+
+ if (crackLightState (valuXMLAtt(ap), &pp->state) < 0)
+ {
+- sprintf (errmsg, "INDI: <%s> bogus state %s for %s %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> bogus state %.64s for %.64s %.64s",
+ tagXMLEle(root), valuXMLAtt(ap), pp->pg->dp->name.ascii(), pp->name.ascii());
+ delete(pp);
+ return (NULL);
+@@ -544,7 +544,7 @@ INDI_G * INDI_D::findGroup (QString gro
+ return curGroup;
+ }
+
+- sprintf (errmsg, "INDI: group %s not found in %s", grouptag.ascii(), name.ascii());
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: group %.64s not found in %.64s", grouptag.ascii(), name.ascii());
+ return NULL;
+ }
+
+@@ -559,7 +559,7 @@ INDI_G * INDI_D::findGroup (QString gro
+
+ ap = findXMLAtt(root, "perm");
+ if (!ap) {
+- sprintf (errmsg, "INDI: <%s %s %s> missing attribute 'perm'",
++ snprintf (errmsg, ERRMSG_SIZE,"INDI: <%.64s %.64s %.64s> missing attribute 'perm'",
+ tagXMLEle(root), pp->pg->dp->name.ascii(), pp->name.ascii());
+ return (-1);
+ }
+@@ -570,7 +570,7 @@ INDI_G * INDI_D::findGroup (QString gro
+ else if (!strcmp(valuXMLAtt(ap), "rw") || !strcmp(valuXMLAtt(ap), "w"))
+ *permp = PP_RW;
+ else {
+- sprintf (errmsg, "INDI: <%s> unknown perm %s for %s %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> unknown perm %.64s for %.64s %.64s",
+ tagXMLEle(root), valuXMLAtt(ap), pp->pg->dp->name.ascii(), pp->name.ascii());
+ return (-1);
+ }
+@@ -769,7 +769,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *ro
+ return (err);
+ }
+
+- sprintf (errmsg, "INDI: <%s> unknown rule %s for %s %s",
++ snprintf (errmsg, ERRMSG_SIZE, "INDI: <%.64s> unknown rule %.64s for %.64s %.64s",
+ tagXMLEle(root), valuXMLAtt(ap), name.ascii(), pp->name.ascii());
+
+ delete(pp);
diff -r 3e45408f892b -r 487d27ee2908 misc/kdeedu3/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdeedu3/patches/patch-ae Sun Feb 20 11:31:11 2005 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-ae,v 1.1 2005/02/20 11:31:11 markd Exp $
+
+--- kstars/kstars/indidriver.cpp.orig 2004-07-18 05:52:56.000000000 +1200
++++ kstars/kstars/indidriver.cpp
+@@ -19,6 +19,7 @@
+ #include "indihostconf.h"
+ #include "devicemanager.h"
+ #include "indidevice.h"
++#include "indi/indicom.h"
+
+ #include "kstars.h"
+ #include "kstarsdata.h"
+@@ -532,7 +533,7 @@ bool INDIDriver::buildDeviceGroup(XMLEle
+
+ if (!ap)
+ {
+- sprintf(errmsg, "Tag %s does not have a group attribute", tagXMLEle(root));
++ snprintf(errmsg, ERRMSG_SIZE, "Tag %.64s does not have a group attribute", tagXMLEle(root));
+ return false;
+ }
Home |
Main Index |
Thread Index |
Old Index