head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.44 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.42 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.40 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.38 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.36 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.34 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.32 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.30 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.28 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.26 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.24 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.22 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.20 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.18 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.16 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.14 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.12 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.10 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.8 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.6 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.4 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.5 date 2005.01.03.14.32.33; author wiz; state dead; branches; next 1.4; 1.4 date 2001.12.03.15.37.21; author skrll; state Exp; branches; next 1.3; 1.3 date 2001.10.15.22.46.23; author skrll; state Exp; branches; next 1.2; 1.2 date 2001.09.07.14.32.22; author drochner; state dead; branches; next 1.1; 1.1 date 2001.05.01.09.46.37; author skrll; state Exp; branches; next ; desc @@ 1.5 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-au,v 1.4 2001/12/03 15:37:21 skrll Exp $ --- kio/Makefile.in.orig Tue Nov 13 20:57:17 2001 +++ kio/Makefile.in @@@@ -280,7 +280,7 @@@@ SUBDIRS = . klauncher kded file http ftp pics tests ksendbugmail kpac gzip kssld $(BZIP2DIR) -lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la +lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la bin_PROGRAMS = kio_uiserver kmailservice #libkioslave_la_LDFLAGS = -version-info 3:0 @@@@ -304,15 +304,19 @@@@ libkio_la_SOURCES=kshred.cpp kprotocolmanager.cpp slave.cpp slaveinterface.cpp sessiondata.cpp scheduler.cpp connection.cpp job.cpp global.cpp slaveconfig.cpp netaccess.cpp paste.cpp kmimemagic.cpp tcpslavebase.cpp slavebase.cpp passdlg.cpp progressbase.cpp defaultprogress.cpp statusbarprogress.cpp kdirnotify.cpp observer.cpp kemailsettings.cpp authinfo.cpp kprotocolinfo.cpp kprotocolinfofactory.cpp kdirnotify_skel.cpp kdirnotify_stub.cpp uiserver_stub.cpp observer_skel.cpp -kio_uiserver_SOURCES = dummy.cpp -kio_uiserver_LDADD = kio_uiserver.la +kio_uiserver_SOURCES = kio_uiserver_main.cpp +kio_uiserver_LDADD = libkio_uiserver_main.la kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp #>+ 1 -kio_uiserver_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp +libkio_uiserver_main_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp -kio_uiserver_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la +libkio_uiserver_main_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la +libkio_uiserver_main_la_LDFLAGS = $(all_libraries) + +kio_uiserver_la_SOURCES = kio_uiserver_main.cpp +kio_uiserver_la_LIBADD = libkio_uiserver_main.la kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version #>- METASOURCES = AUTO @@@@ -392,22 +396,26 @@@@ libksycoca_la_meta_unload.lo @@KDE_USE_FINAL_FALSE@@libksycoca_la_OBJECTS = $(libksycoca_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libksycoca_la_OBJECTS = $(libksycoca_la_final_OBJECTS) -kio_uiserver_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \ +libkio_uiserver_main_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \ ../kdesu/libkdesu.la -#>- kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo +#>- libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo #>+ 5 -kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ - kio_uiserver_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) +libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ + libkio_uiserver_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) +kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la +#>- kio_uiserver_la_OBJECTS = kio_uiserver_main.lo +#>+ 1 +kio_uiserver_la_OBJECTS = kio_uiserver_main.lo bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kio_uiserver_OBJECTS = dummy.$(OBJEXT) +#>- kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) #>+ 1 -kio_uiserver_OBJECTS = dummy.$(OBJEXT) -kio_uiserver_DEPENDENCIES = kio_uiserver.la +kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) +kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la #>- kmailservice_OBJECTS = kmailservice.$(OBJEXT) #>+ 1 kmailservice_OBJECTS = kmailservice.$(OBJEXT) @@@@ -438,15 +446,15 @@@@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kscan.desktop kio_uiserver.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD +KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kio_uiserver.desktop kscan.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) -OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS) +SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) +OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(libkio_uiserver_main_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS) #>- all: all-redirect #>+ 1 @@@@ -545,6 +553,9 @@@@ @@KDE_USE_CLOSURE_FALSE@@libksycoca.la: $(libksycoca_la_OBJECTS) $(libksycoca_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libksycoca_la_LDFLAGS) $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS) +libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS) + kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) @@@@ -940,9 +951,6 @@@@ #kdirnotify_stub.h $(srcdir)/kmimetype.cpp: kdirnotify_stub.h -dummy.cpp: uiserver.kidl - echo > dummy.cpp - parser: $(parserfiles) cd $(srcdir) ;\ flex -olex.c -Pkiotrader lex.l ;\ @@@@ -1162,21 +1170,21 @@@@ #>+ 12 -kio_uiserver_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc - @@echo 'creating kio_uiserver_la_meta_unload.cpp' - @@-rm -f kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc + @@echo 'creating libkio_uiserver_main_la_meta_unload.cpp' + @@-rm -f libkio_uiserver_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\ - cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp ;\ - echo '0};' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '#include ' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp ;\ - else echo > kio_uiserver_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\ + cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + else echo > libkio_uiserver_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp kio_uiserver_la_meta_unload.cpp + -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp libkio_uiserver_main_la_meta_unload.cpp #>+ 11 libkio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kshred.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/slave.cpp $(srcdir)/slaveinterface.cpp $(srcdir)/sessiondata.cpp $(srcdir)/scheduler.cpp $(srcdir)/connection.cpp $(srcdir)/job.cpp $(srcdir)/global.cpp $(srcdir)/slaveconfig.cpp $(srcdir)/netaccess.cpp $(srcdir)/paste.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/tcpslavebase.cpp $(srcdir)/slavebase.cpp $(srcdir)/passdlg.cpp $(srcdir)/progressbase.cpp $(srcdir)/defaultprogress.cpp $(srcdir)/statusbarprogress.cpp $(srcdir)/kdirnotify.cpp $(srcdir)/observer.cpp $(srcdir)/kemailsettings.cpp $(srcdir)/authinfo.cpp $(srcdir)/kprotocolinfo.cpp $(srcdir)/kprotocolinfofactory.cpp kdirnotify_skel.cpp kdirnotify_stub.cpp uiserver_stub.cpp observer_skel.cpp libkio_la_meta_unload.cpp jobclasses.moc ktrader.moc passdlg.moc kfilterbase.moc sessiondata.moc statusbarprogress.moc krun.moc slaveconfig.moc kurlcompletion.moc defaultprogress.moc kscan.moc kdirwatch.moc previewjob.moc slaveinterface.moc renamedlg.moc chmodjob.moc kdirlister.moc observer.moc uiserver.moc slave.moc kautomount.moc kurifilter.moc skipdlg.moc netaccess.moc kshred.moc kshellcompletion.moc connection.moc progressbase.moc scheduler.moc @@@@ -1203,11 +1211,23 @@@@ rm -f libksycoca_la.all_cpp.final libksycoca_la.all_cpp.files #>+ 11 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp + @@echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ + rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \ + for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \ + done; \ + cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ + rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files + +#>+ 11 +kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp @@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ - for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ done; \ @@@@ -1215,11 +1235,11 @@@@ rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files #>+ 11 -kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp @@echo 'creating kio_uiserver.all_cpp.cpp ...'; \ rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \ done; \ @@@@ -1240,20 +1260,20 @@@@ #>+ 3 clean-final: - -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp + -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp #>+ 2 final: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.4 log @Update to KDE 2.2.2 Closes pkg/14728 from Mark Davies . Changes from him with updates from myself. From www.kde.org... The principal improvements over KDE 2.2.1, release two months ago, include: o security-related - SSL certificate loading - symlink vulnerability in .wmrc access by KDM introduced in 2.2 - security problem with eFax (used by klprfax) - potential problem in PAM invocation by KDM - potential harmful side-effect of failed KDM session starts o new features - added support for CodeWeavers' CrossOver plug-in (provides support for QuickTime, etc.) - added support for the wheelmouse for scrolling through the KGhostview PS/PDF viewer component - ability to search for multiple patterns at a time in the file search dialog - debugging multi-threaded applications with KDevelop o improvements/fixes - handling of HTTP links that redirect to FTP - POST using SSL through a proxy and sending headers through proxies - saving of recently-selected files in the file dialog - handling of non-ASCII characters over SMB - toolbar button captions with certain styles - selecting items with the mouse in Konqueror - sorting in Konqueror's textview - saving current settings as a theme in the theme manager - crashes in KMail with certain mails - crash on invoking the KDM chooser - non-Latin languages with KDevelop performance - icon loading optimized - file dialog speedups - stop spinning SMB client processes - handling of large files in Kate @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc. @ text @a0 1 Cannot strip away RCS IDs, please handle manually! d3 1 a3 1 --- kio/Makefile.in.orig Wed Sep 12 06:10:12 2001 d5 4 a8 7 @@@@ -2 +2 @@@@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am @@@@ -4 +4 @@@@ -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. @@@@ -287 +287 @@@@ d11 7 a17 1 @@@@ -311,2 +311,2 @@@@ d22 2 a23 1 @@@@ -315 +315 @@@@ d26 1 a26 1 @@@@ -317 +317 @@@@ d29 1 a29 1 @@@@ -319 +319,5 @@@@ d36 7 a42 1 @@@@ -399 +403 @@@@ d45 1 a45 1 @@@@ -401 +405 @@@@ d48 1 a48 1 @@@@ -403,5 +407,9 @@@@ d51 1 a51 1 -kio_uiserver_la_meta_unload.lo d56 1 a56 1 +libkio_uiserver_main_la_meta_unload.lo d63 3 a65 1 @@@@ -411 +419 @@@@ d68 1 a68 1 @@@@ -413,2 +421,2 @@@@ d73 7 a79 1 @@@@ -445 +453 @@@@ d82 6 a87 1 @@@@ -452,2 +460,2 @@@@ d92 7 a98 1 @@@@ -551,0 +560,3 @@@@ d102 7 a108 16 @@@@ -755 +766 @@@@ - test "$$subdir" = "." && dot_seen=yes; \ + test "$$subdir" != "." || dot_seen=yes; \ @@@@ -813,11 +823,0 @@@@ -#>- @@for file in $(DISTFILES); do \ -#>- d=$(srcdir); \ -#>- if test -d $$d/$$file; then \ -#>- cp -pr $$/$$file $(distdir)/$$file; \ -#>- else \ -#>- test -f $(distdir)/$$file \ -#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ -#>- fi; \ -#>- done -#>+ 10 @@@@ -958,3 +957,0 @@@@ d112 7 a118 1 @@@@ -1176,8 +1173,8 @@@@ a121 5 - @@echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp - @@cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp - @@echo '0};' >> kio_uiserver_la_meta_unload.cpp - @@echo '#include ' >> kio_uiserver_la_meta_unload.cpp - @@echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp d125 17 a141 6 + @@echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp + @@cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp + @@echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp + @@echo '#include ' >> libkio_uiserver_main_la_meta_unload.cpp + @@echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp @@@@ -1188 +1185 @@@@ d144 7 a150 1 @@@@ -1215 +1212,13 @@@@ d165 3 a167 1 @@@@ -1219 +1228 @@@@ d170 7 a176 1 @@@@ -1227 +1236 @@@@ d179 3 a181 1 @@@@ -1231 +1240 @@@@ d184 7 a190 1 @@@@ -1252 +1261 @@@@ d193 3 a195 1 @@@@ -1256 +1265 @@@@ d198 6 a203 1 @@@@ -1259 +1268 @@@@ d206 7 @ 1.2 log @update to 2.1.2 This release provides the following fixes: Security fixes: KDEsu. The KDEsu which shipped with earlier releases of KDE 2 writes a (very) temporary but world-readable file with authentication information. A local user can potentially abuse this behavior to gain access to the X server and, if KDEsu is used to perform tasks that require root-access, can result in comprimise of the root account. Bug fixes: kio_http. Fixed problems with "protocol for http://x.y.z died unexpectedly" and with proxy authentication with Konqueror. kparts. Fixed crash in KOffice 1.1 when splitting views. khtml. Fixed memory leak in Konqueror. Fixed minor HTML rendering problems. kcookiejar. Fixed minor problems with HTTP cookies. kconfig. Fixed problem with leading/trailing spaces in configuration values. kdebug. Fixed memory leak in debug output. klineedit. Fixed problem with klineedit emitting "return pressed" twice. (The security fix was already dealt with by patches.) @ text @d1 2 a2 1 $NetBSD: patch-au,v 1.1 2001/05/01 09:46:37 skrll Exp $ d4 26 a29 48 --- kdesu/kdesu_stub.c.orig Sun Feb 18 15:26:55 2001 +++ kdesu/kdesu_stub.c @@@@ -173,6 +173,7 @@@@ return list; } +#define BUFSIZE 8192 /** * The main program @@@@ -180,9 +181,9 @@@@ int main() { - char buf[1024]; - char command[200], xauthority[200], iceauthority[200]; - char **host, **auth, *fname; + char buf[BUFSIZE+1]; + char xauthority[200], iceauthority[200]; + char **host, **auth; int i/*, res, sycoca*/, prio; pid_t pid; FILE *fout; @@@@ -194,7 +195,7 @@@@ { printf("%s\n", params[i].name); fflush(stdout); - if (fgets(buf, 500, stdin) == 0L) + if (fgets(buf, BUFSIZE, stdin) == 0L) { printf("end\n"); fflush(stdout); perror("kdesu_stub: fgets()"); @@@@ -276,22 +277,34 @@@@ xsetenv("DISPLAY", params[P_DISPLAY].value); if (params[P_DISPLAY_AUTH].value[0]) { - fname = tmpnam(0L); - fout = fopen(fname, "w"); - if (!fout) - { - perror("kdesu_stub: fopen()"); + int fd2; + /* + ** save umask and set to 077, so we create those files only + ** readable for root. (if someone else could read them, we + ** are in deep shit). + */ + int oldumask = umask(077); d31 42 a72 3 + strcpy(xauthority, "/tmp/xauth.XXXXXXXXXX"); + fd2 = mkstemp(xauthority); + umask(oldumask); d74 51 a124 6 + if (fd2 == -1) { + perror("kdesu_stub: mkstemp()"); + exit(1); + } else + close(fd2); + xsetenv("XAUTHORITY", xauthority); d126 20 a145 64 + fout = popen("xauth >/dev/null 2>&1","w"); + if (fout == NULL) + { + perror("kdesu_stub: popen(xauth)"); exit(1); - } - fprintf(fout, "add %s %s\n", params[P_DISPLAY].value, + } + fprintf(fout, "add %s %s\n", params[P_DISPLAY].value, params[P_DISPLAY_AUTH].value); - fclose(fout); - tmpnam(xauthority); - xsetenv("XAUTHORITY", xauthority); - sprintf(command, "xauth source %s >/dev/null 2>&1", fname); - if (system(command)) - printf("kdesu_stub: failed to add X authentication"); - unlink(fname); + pclose(fout); } } @@@@ -305,11 +318,22 @@@@ auth = xstrsep(params[P_ICE_AUTH].value); if (host[0]) { - fname = tmpnam(0L); - fout = fopen(fname, "w"); - if (!fout) - { - perror("kdesu_stub: fopen()"); + int fd; + int oldumask = umask(077); + + strcpy(iceauthority, "/tmp/iceauth.XXXXXXXXXX"); + fd = mkstemp(iceauthority); + umask(oldumask); + if (fd == -1) { + perror("kdesu_stub: mkstemp()"); + exit(1); + } else + close(fd); + xsetenv("ICEAUTHORITY", iceauthority); + + fout = popen("iceauth >/dev/null 2>&1", "w"); + if (!fout) { + perror("kdesu_stub: popen iceauth"); exit(1); } for (i=0; host[i]; i++) @@@@ -317,13 +341,7 @@@@ auth = xstrsep(params[P_DCOP_AUTH].value); for (i=0; host[i]; i++) fprintf(fout, "add DCOP \"\" %s %s\n", host[i], auth[i]); - fclose(fout); - tmpnam(iceauthority); - xsetenv("ICEAUTHORITY", iceauthority); - sprintf(command, "iceauth source %s >/dev/null 2>&1", fname); - if (system(command)) - printf("kdesu_stub: failed to add DCOP authentication\n"); - unlink(fname); + pclose(fout); } } @ 1.1 log @Pull in security fixes for kdesu from KDE-2.1.2. Bump version of kdelibs to 2.1nb1 and update dependencies to the new version. @ text @d1 1 a1 1 $NetBSD$ @