update to kdelibs-2.1.2:

- remove patch-kdesu_stub_c since its now included by default.
This commit is contained in:
lebel 2001-06-08 13:24:19 +00:00
parent 7c38fb687f
commit 4185934e34
5 changed files with 13 additions and 83 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.15 2001/05/24 02:28:30 kevlo Exp $
# $OpenBSD: Makefile,v 1.16 2001/06/08 13:24:19 lebel Exp $
COMMENT= "X11 toolkit, libraries"
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.363
VERSION= 2.1.1
VERSION= 2.1.2
DISTNAME= kdelibs-${VERSION}
DIST_SUBDIR= kde
HOMEPAGE= http://www.kde.org
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${VERSION}/distribution/tar/generic/src/
MASTER_SITE_SUBDIR= stable/${VERSION}/distribution/src
EXTRACT_SUFX= .tar.bz2
# Parts of kde want shared libraries to work, as some symbols are

View File

@ -1,3 +1,3 @@
MD5 (kde/kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
RMD160 (kde/kdelibs-2.1.1.tar.bz2) = 9cad1c4f75f829ec9551307dd9766eb540fa32de
SHA1 (kde/kdelibs-2.1.1.tar.bz2) = 5ecc7902bc5f6528d29b622c79574018fd966654
MD5 (kde/kdelibs-2.1.2.tar.bz2) = 7da819efb418b4ebae65a1ea5ed0ba5c
RMD160 (kde/kdelibs-2.1.2.tar.bz2) = 00ccafe0ade70b9176070158b5dc999c39c311dd
SHA1 (kde/kdelibs-2.1.2.tar.bz2) = db4a609b7940764b91d25b8d06e9bcc32518bfd2

View File

@ -1,75 +0,0 @@
$OpenBSD: patch-kdesu_stub_c,v 1.3 2001/03/14 00:17:32 espie Exp $
--- kdesu/kdesu_stub.c.orig Sat Mar 10 15:22:48 2001
+++ kdesu/kdesu_stub.c Sat Mar 10 15:48:03 2001
@@ -276,9 +276,11 @@ int main()
xsetenv("DISPLAY", params[P_DISPLAY].value);
if (params[P_DISPLAY_AUTH].value[0])
{
- fname = tmpnam(0L);
- fout = fopen(fname, "w");
- if (!fout)
+ int fd;
+ strcpy(fname, "/tmp/kdesu.XXXXXXXXXX");
+
+ fd = mkstemp(fname);
+ if (fd == -1 || (fout = fdopen(fd, "w")) == NULL)
{
perror("kdesu_stub: fopen()");
exit(1);
@@ -286,7 +288,19 @@ int main()
fprintf(fout, "add %s %s\n", params[P_DISPLAY].value,
params[P_DISPLAY_AUTH].value);
fclose(fout);
- tmpnam(xauthority);
+ strcpy(xauthority, "/tmp/xauth.XXXXXXXXXX");
+ {
+ int fd;
+
+ fd = mkstemp(xauthority);
+ if (fd == -1)
+ {
+ perror("kdesu_stub: mkstemp()");
+ exit(1);
+ }
+ else
+ close(fd);
+ }
xsetenv("XAUTHORITY", xauthority);
sprintf(command, "xauth source %s >/dev/null 2>&1", fname);
if (system(command))
@@ -305,9 +319,11 @@ int main()
auth = xstrsep(params[P_ICE_AUTH].value);
if (host[0])
{
- fname = tmpnam(0L);
- fout = fopen(fname, "w");
- if (!fout)
+ int fd;
+ strcpy(fname, "/tmp/kdesu.XXXXXXXXXX");
+
+ fd = mkstemp(fname);
+ if (fd == -1 || (fout = fdopen(fd, "w")) == NULL)
{
perror("kdesu_stub: fopen()");
exit(1);
@@ -318,7 +334,19 @@ int main()
for (i=0; host[i]; i++)
fprintf(fout, "add DCOP \"\" %s %s\n", host[i], auth[i]);
fclose(fout);
- tmpnam(iceauthority);
+ strcpy(iceauthority, "/tmp/iceauth.XXXXXXXXXX");
+ {
+ int fd;
+
+ fd = mkstemp(iceauthority);
+ if (fd == -1)
+ {
+ perror("kdesu_stub: mkstemp()");
+ exit(1);
+ }
+ else
+ close(fd);
+ }
xsetenv("ICEAUTHORITY", iceauthority);
sprintf(command, "iceauth source %s >/dev/null 2>&1", fname);
if (system(command))

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/03/12 16:15:21 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.5 2001/06/08 13:24:21 lebel Exp $
lib/kde2/libkbzip2filter.so.0.0
lib/kde2/libkgzipfilter.so.0.0
lib/kde2/libkimg_eps.so.0.0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2001/03/30 12:31:36 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2001/06/08 13:24:21 lebel Exp $
bin/artsc-config
bin/artscat
bin/artsd
@ -16,6 +16,7 @@ bin/kdb2html
bin/kde-config
bin/kded
bin/kdeinit
bin/kdeinit_shutdown
bin/kdeinit_wrapper
bin/kdesu_stub
bin/kio_http_cache_cleaner
@ -1846,6 +1847,7 @@ share/icons/locolor/16x16/actions/eraser.png
share/icons/locolor/16x16/actions/exec.png
share/icons/locolor/16x16/actions/exit.png
share/icons/locolor/16x16/actions/fileclose.png
share/icons/locolor/16x16/actions/filefind.png
share/icons/locolor/16x16/actions/filenew.png
share/icons/locolor/16x16/actions/fileopen.png
share/icons/locolor/16x16/actions/fileprint.png
@ -1858,10 +1860,12 @@ share/icons/locolor/16x16/actions/finish.png
share/icons/locolor/16x16/actions/flag.png
share/icons/locolor/16x16/actions/folder_new.png
share/icons/locolor/16x16/actions/forward.png
share/icons/locolor/16x16/actions/frameprint.png
share/icons/locolor/16x16/actions/gear.png
share/icons/locolor/16x16/actions/gohome.png
share/icons/locolor/16x16/actions/goto.png
share/icons/locolor/16x16/actions/help.png
share/icons/locolor/16x16/actions/history.png
share/icons/locolor/16x16/actions/idea.png
share/icons/locolor/16x16/actions/identity.png
share/icons/locolor/16x16/actions/kde/0001.png
@ -2202,6 +2206,7 @@ share/mimelnk/application/x-tzo.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/audio/basic.desktop
share/mimelnk/audio/mpegurl.desktop
share/mimelnk/audio/vnd.rn-realaudio.desktop
share/mimelnk/audio/x-adpcm.desktop
share/mimelnk/audio/x-aiff.desktop