cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to konqueror-embedded 20030516

Browse Source 
Besides being a lot more stable this also fixes a security
issue of konq-e not validating the CN (Common Name) field
of a X.509 cert.

http://marc.theaimsgroup.com/?l=bugtraq&m=105232797614945&w=2

ok naddy@
This commit is contained in:
brad 2003-05-19 18:21:34 +00:00
parent b72531fbfe
commit 0af2d3bbde
19 changed files with 74 additions and 2987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
www/konqueror-embedded/Makefile
View File

@ -1,26 +1,31 @@
# $OpenBSD: Makefile,v 1.6 2002/09/14 02:14:36 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2003/05/19 18:21:34 brad Exp $
COMMENT='stand-alone web browser'
COMMENT='stand-alone Qt-based web browser'
CATEGORIES=www x11
MODULES= qt2
DATE= 20020311
DATE= 20030516
DISTNAME=konqueror-embedded-snapshot-${DATE}
PKGNAME=konqueror-${DATE}p1
PKGNAME=konqueror-${DATE}
HOMEPAGE=http://www.konqueror.org/embedded.html
MASTER_SITES= http://devel-home.kde.org/~hausmann/snapshots/
MAINTAINER= Marc Espie <espie@openbsd.org>
CONFIGURE_STYLE= autoconf
AUTOCONF_NEW= Yes
AUTOCONF_VERSION= 2.52
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include:${LOCALBASE}/include/libpng
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-threading
CONFIGURE_ARGS+= --enable-add-ons=kplaintext
CONFIGURE_ARGS+= --enable-ftp
CONFIGURE_ARGS+= --enable-mitshm
CONFIGURE_ARGS+= --enable-readwrite
CONFIGURE_ARGS+= --enable-sortdir
CONFIGURE_ARGS+= --disable-dlopen
CONFIGURE_ARGS+= --disable-debug
#CONFIGURE_ARGS+= --enable-debug=full
#CONFIGURE_ARGS+= --enable-final
@ -33,33 +38,29 @@ LIB_DEPENDS= png.2::graphics/png \
pcreposix,pcre::devel/pcre \
lcms::graphics/lcms
# you don't want to know...
CONFIGURE_ENV+= ac_aux_files=''
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
#MAKE_FLAGS+=AM_CXXFLAGS=-g AM_CFLAGS=-g
# ensures configure does not pick up automake
KONQ= ${PREFIX}/lib/konq-e
KONQ=${PREFIX}/lib/konq-e
post-build:
sed -e s,%PREFIX%,${TRUEPREFIX}, <${FILESDIR}/konq-e >${WRKDIR}/konq-e
@sed -e s,%PREFIX%,${TRUEPREFIX}, <${FILESDIR}/konq-e >${WRKDIR}/konq-e
post-install:
${INSTALL_DATA_DIR} ${KONQ}/share/apps/khtml/css \
${KONQ}/share/apps/kplaintextpart \
${KONQ}/share/apps/kssl/caroot \
${KONQ}/pics ${KONQ}/apps/Applications \
${KONQ}/share/config
${KONQ}/share/config ${KONQ}/share/services
@mv ${PREFIX}/bin/konqueror ${PREFIX}/libexec/konq-e
.for i in apps/Applications/konqueror.desktop pics/konqueror.png \
share/apps/khtml/css/html4.css share/apps/kssl/caroot/ca-bundle.crt \
share/config/charsets share/config/khtmlrc
share/apps/khtml/css/html4.css share/apps/kplaintextpart/kplaintextpart.rc \
share/apps/kssl/caroot/ca-bundle.crt share/config/charsets \
share/config/khtmlrc share/services/kplaintextpart.desktop
@mv ${PREFIX}/$i ${KONQ}/$i
.endfor
${INSTALL_PROGRAM} ${WRKDIR}/konq-e ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKDIR}/konq-e ${PREFIX}/bin
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes

6
www/konqueror-embedded/distinfo
View File

@ -1,3 +1,3 @@
MD5 (konqueror-embedded-snapshot-20020311.tar.gz) = 81b1dc8ff44782126c2c8069f74fc31b
RMD160 (konqueror-embedded-snapshot-20020311.tar.gz) = 17f8dbfb2a59a4a5e5dd0717b021e2ebd5704b56
SHA1 (konqueror-embedded-snapshot-20020311.tar.gz) = 12910f686cf08170c164907ff0f1f614add61e15
MD5 (konqueror-embedded-snapshot-20030516.tar.gz) = a58888ab9b7910c5d5f498da15f2d425
RMD160 (konqueror-embedded-snapshot-20030516.tar.gz) = 99526b4e9b0de1389f92d107130758aac1d1df7a
SHA1 (konqueror-embedded-snapshot-20030516.tar.gz) = 46a2caa30cd3c33181257d2c194d023482191423

40
www/konqueror-embedded/patches/patch-aclocal_m4
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2002/09/14 15:00:56 naddy Exp $
--- aclocal.m4.orig Mon Mar 11 20:35:35 2002
+++ aclocal.m4 Sat Sep 14 16:29:08 2002
@@ -2524,10 +2524,8 @@ AC_DEFUN(AC_CHECK_COMPILERS,
$OpenBSD: patch-aclocal_m4,v 1.3 2003/05/19 18:21:34 brad Exp $
--- aclocal.m4.orig Fri May 16 14:54:06 2003
+++ aclocal.m4 Fri May 16 20:56:27 2003
@@ -2672,10 +2672,8 @@ AC_DEFUN(AC_CHECK_COMPILERS,
if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 $CFLAGS"
else
@ -13,7 +13,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/09/14 15:00:56 naddy Exp $
fi
fi
@@ -2557,7 +2555,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
@@ -2705,7 +2703,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 $CXXFLAGS"
else
@ -22,7 +22,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/09/14 15:00:56 naddy Exp $
fi
fi
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
@@ -2568,8 +2566,6 @@ AC_DEFUN(AC_CHECK_COMPILERS,
@@ -2716,8 +2714,6 @@ AC_DEFUN(AC_CHECK_COMPILERS,
else
if test "$CXX" = "KCC"; then
CXXFLAGS="+K3 $CXXFLAGS"
@ -31,7 +31,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/09/14 15:00:56 naddy Exp $
fi
fi
fi
@@ -3455,6 +3451,11 @@ LIBDL="-ldl"
@@ -3585,6 +3581,11 @@ LIBDL="-ldl"
ac_cv_have_dlfcn=yes
])
@ -43,24 +43,12 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/09/14 15:00:56 naddy Exp $
AC_CHECK_LIB(dld, shl_unload, [
LIBDL="-ldld"
ac_cv_have_shload=yes
@@ -5347,19 +5348,7 @@ netbsd*)
;;
@@ -10683,7 +10684,7 @@ AC_MSG_RESULT([$SED])
openbsd* )
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case "$host_cpu" in
- i*86 )
- changequote(,)dnl
- lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
- changequote([, ])dnl
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
+ lt_cv_deplibs_check_method=pass_all
;;
# serial 10
newsos6)
-AC_PREREQ([2.54])
+AC_PREREQ([2.52])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.

28
www/konqueror-embedded/patches/patch-admin_libtool_m4_in
View File

@ -1,24 +1,18 @@
$OpenBSD: patch-admin_libtool_m4_in,v 1.1 2002/09/14 02:14:36 naddy Exp $
--- admin/libtool.m4.in.orig Fri Feb 1 21:51:46 2002
+++ admin/libtool.m4.in Sat Sep 14 03:42:47 2002
@@ -617,19 +617,7 @@ netbsd*)
$OpenBSD: patch-admin_libtool_m4_in,v 1.2 2003/05/19 18:21:34 brad Exp $
--- admin/libtool.m4.in.orig Thu Nov 7 17:47:40 2002
+++ admin/libtool.m4.in Fri May 16 20:58:47 2003
@@ -1996,13 +1996,7 @@ nto-qnx)
;;
openbsd* )
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case "$host_cpu" in
- i*86 )
- changequote(,)dnl
- lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
- changequote([, ])dnl
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
- else
- lt_cv_deplibs_check_method=pass_all
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
+ lt_cv_deplibs_check_method=pass_all
;;
newsos6)
osf3* | osf4* | osf5*)

20
www/konqueror-embedded/patches/patch-admin_ltcf-c_sh
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-admin_ltcf-c_sh,v 1.1 2002/09/14 02:14:36 naddy Exp $
--- admin/ltcf-c.sh.orig Fri Dec 7 11:06:18 2001
+++ admin/ltcf-c.sh Sat Sep 14 03:42:47 2002
@@ -457,10 +457,14 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ remove_lgcc=yes
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
;;
os2*)

21
www/konqueror-embedded/patches/patch-admin_ltcf-cxx_sh
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-admin_ltcf-cxx_sh,v 1.1 2002/09/14 02:14:36 naddy Exp $
--- admin/ltcf-cxx.sh.orig Fri Feb 1 21:51:46 2002
+++ admin/ltcf-cxx.sh Sat Sep 14 03:42:47 2002
@@ -413,14 +413,14 @@ case $host_os in
openbsd*)
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
# MM: OpenBSD 2.7 uses G++, but not GNU ld
- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
- whole_archive_flag_spec='${wl}-Bforcearchive'
remove_lgcc=yes
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
fi
;;
osf3*)

37
www/konqueror-embedded/patches/patch-admin_ltconfig
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-admin_ltconfig,v 1.1 2002/09/14 02:14:36 naddy Exp $
--- admin/ltconfig.orig Fri Dec 7 11:06:18 2001
+++ admin/ltconfig Sat Sep 14 03:42:47 2002
@@ -625,7 +625,12 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds";;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds";;
+ esac
fi
# Source the script associated with the $tagname tag configuration.
@@ -1246,15 +1251,15 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=yes
+ need_version=yes
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
# OpenBSD 2.7 the overriding is needed for fast-install
shlibpath_overrides_runpath=yes
+ deplibs_check_method=pass_all
+ sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
;;
os2*)

8
www/konqueror-embedded/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1 2002/05/28 15:51:02 todd Exp $
--- configure.in.orig Tue May 28 10:23:34 2002
+++ configure.in Tue May 28 10:22:41 2002
@@ -451,6 +451,7 @@ AC_CHECK_FUNC(getaddrinfo,
$OpenBSD: patch-configure_in,v 1.2 2003/05/19 18:21:34 brad Exp $
--- configure.in.orig Fri May 16 14:54:03 2003
+++ configure.in Fri May 16 20:56:27 2003
@@ -531,6 +531,7 @@ AC_CHECK_FUNC(getaddrinfo,
{
struct addrinfo hint, *res;
int err;

70
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_Makefile_in
View File

@ -1,70 +0,0 @@
$OpenBSD: patch-konq-embed_dropin_kio_Makefile_in,v 1.1 2002/03/30 18:48:59 espie Exp $
--- konq-embed/dropin/kio/Makefile.in.orig Sat Mar 30 18:38:54 2002
+++ konq-embed/dropin/kio/Makefile.in Sat Mar 30 18:39:50 2002
@@ -256,7 +256,7 @@ noinst_LTLIBRARIES = libkiodropin.la
libkiodropin_la_SOURCES = slavebase.cpp job.cpp netaccess.cpp jobclasses.cpp \
ktrader.cpp kprotocolmanager.cpp krun.cpp authcache.cpp authcache_skel.cpp \
scheduler.cpp observer.cpp \
- slave.cpp passdlg.cpp kio_file.cpp kmimemagic.cpp global.cpp \
+ slave.cpp passdlg.cpp kio_file.cpp kio_ftp.cpp kmimemagic.cpp global.cpp \
launcher.cpp
#>- libkiodropin_la_METASOURCES = AUTO
@@ -273,7 +273,7 @@ libkiodropin_la_LIBADD =
am_libkiodropin_la_OBJECTS = slavebase.lo job.lo netaccess.lo \
jobclasses.lo ktrader.lo kprotocolmanager.lo krun.lo \
authcache.lo authcache_skel.lo scheduler.lo observer.lo \
- slave.lo passdlg.lo kio_file.lo kmimemagic.lo global.lo \
+ slave.lo passdlg.lo kio_file.lo kio_ftp.lo kmimemagic.lo global.lo \
launcher.lo
#>- libkiodropin_la_OBJECTS = $(am_libkiodropin_la_OBJECTS)
#>+ 8
@@ -281,7 +281,7 @@ libkiodropin_la_final_OBJECTS = libkiodr
libkiodropin_la_nofinal_OBJECTS = slavebase.lo job.lo netaccess.lo \
jobclasses.lo ktrader.lo kprotocolmanager.lo krun.lo \
authcache.lo authcache_skel.lo scheduler.lo observer.lo \
- slave.lo passdlg.lo kio_file.lo kmimemagic.lo global.lo \
+ slave.lo passdlg.lo kio_file.lo kio_ftp.lo kmimemagic.lo global.lo \
launcher.lo
@KDE_USE_FINAL_FALSE@libkiodropin_la_OBJECTS = $(libkiodropin_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libkiodropin_la_OBJECTS = $(libkiodropin_la_final_OBJECTS)
@@ -295,7 +295,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/authcache.Plo \
@AMDEP_TRUE@ $(DEPDIR)/authcache_skel.Plo $(DEPDIR)/global.Plo \
@AMDEP_TRUE@ $(DEPDIR)/job.Plo $(DEPDIR)/jobclasses.Plo \
- @AMDEP_TRUE@ $(DEPDIR)/kio_file.Plo $(DEPDIR)/kmimemagic.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/kio_file.Plo $(DEPDIR)/kio_ftp.Plo $(DEPDIR)/kmimemagic.Plo \
@AMDEP_TRUE@ $(DEPDIR)/kprotocolmanager.Plo $(DEPDIR)/krun.Plo \
@AMDEP_TRUE@ $(DEPDIR)/ktrader.Plo $(DEPDIR)/launcher.Plo \
@AMDEP_TRUE@ $(DEPDIR)/netaccess.Plo $(DEPDIR)/observer.Plo \
@@ -374,6 +374,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/job.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/jobclasses.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_ftp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmimemagic.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kprotocolmanager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/krun.Plo@am__quote@
@@ -503,7 +504,7 @@ distclean-tags:
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kio_file.h job.h krun.h launcher.h netaccess.h kimageio.h kfileitem.h scheduler.h slave.h slavebase.h kprotocolmanager.h authcache.h jobclasses.h kmimetype.h kmimemagic.h ktrader.h passdlg.h observer.h kservice.h
+KDE_DIST=kio_file.h kio_ftp.h job.h krun.h launcher.h netaccess.h kimageio.h kfileitem.h scheduler.h slave.h slavebase.h kprotocolmanager.h authcache.h jobclasses.h kmimetype.h kmimemagic.h ktrader.h passdlg.h observer.h kservice.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -676,11 +677,11 @@ force-reedit:
#>+ 11
-libkiodropin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/slavebase.cpp $(srcdir)/job.cpp $(srcdir)/netaccess.cpp $(srcdir)/jobclasses.cpp $(srcdir)/ktrader.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/krun.cpp $(srcdir)/authcache.cpp $(srcdir)/authcache_skel.cpp $(srcdir)/scheduler.cpp $(srcdir)/observer.cpp $(srcdir)/slave.cpp $(srcdir)/passdlg.cpp $(srcdir)/kio_file.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/global.cpp $(srcdir)/launcher.cpp krun.moc jobclasses.moc authcache.moc slave.moc scheduler.moc
+libkiodropin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/slavebase.cpp $(srcdir)/job.cpp $(srcdir)/netaccess.cpp $(srcdir)/jobclasses.cpp $(srcdir)/ktrader.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/krun.cpp $(srcdir)/authcache.cpp $(srcdir)/authcache_skel.cpp $(srcdir)/scheduler.cpp $(srcdir)/observer.cpp $(srcdir)/slave.cpp $(srcdir)/passdlg.cpp $(srcdir)/kio_file.cpp $(srcdir)/kio_ftp.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/global.cpp $(srcdir)/launcher.cpp krun.moc jobclasses.moc authcache.moc slave.moc scheduler.moc
@echo 'creating libkiodropin_la.all_cpp.cpp ...'; \
rm -f libkiodropin_la.all_cpp.files libkiodropin_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkiodropin_la.all_cpp.final; \
- for file in slavebase.cpp job.cpp netaccess.cpp jobclasses.cpp ktrader.cpp kprotocolmanager.cpp krun.cpp authcache.cpp authcache_skel.cpp scheduler.cpp observer.cpp slave.cpp passdlg.cpp kio_file.cpp kmimemagic.cpp global.cpp launcher.cpp ; do \
+ for file in slavebase.cpp job.cpp netaccess.cpp jobclasses.cpp ktrader.cpp kprotocolmanager.cpp krun.cpp authcache.cpp authcache_skel.cpp scheduler.cpp observer.cpp slave.cpp passdlg.cpp kio_file.cpp kio_ftp.cpp kmimemagic.cpp global.cpp launcher.cpp ; do \
echo "#include \"$$file\"" >> libkiodropin_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkiodropin_la.all_cpp.final; \
done; \

2256
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_cpp
View File

File diff suppressed because it is too large Load Diff

282
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_kio_ftp_h
View File

@ -1,282 +0,0 @@
$OpenBSD: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.3 2002/03/31 15:57:05 espie Exp $
--- konq-embed/dropin/kio/kio_ftp.h.orig Sat Mar 30 21:19:45 2002
+++ konq-embed/dropin/kio/kio_ftp.h Sun Mar 31 17:42:53 2002
@@ -0,0 +1,278 @@
+/* This file is part of the KDE libraries
+ Copyright (C) 2000 David Faure <faure@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+// $Id: patch-konq-embed_dropin_kio_kio_ftp_h,v 1.3 2002/03/31 15:57:05 espie Exp $
+
+#ifndef __ftp_h__
+#define __ftp_h__
+
+#include <config.h>
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#define FTP_BUFSIZ 1024
+
+#include <qcstring.h>
+#include <qstring.h>
+
+#include <kurl.h>
+#include <kio/slavebase.h>
+
+class KExtendedSocket;
+
+struct FtpEntry
+{
+ QString name;
+ QString owner;
+ QString group;
+ QString link;
+
+ long size;
+ mode_t type;
+ mode_t access;
+ time_t date;
+};
+
+struct netbuf
+{
+ char *cput,*cget;
+ int handle;
+ int cavail,cleft;
+ char buf[FTP_BUFSIZ];
+};
+
+class Ftp : public KIO::SlaveBase
+{
+public:
+ Ftp( const QCString &pool, const QCString &app );
+ virtual ~Ftp();
+
+ virtual void setHost( const QString& host, int port, const QString& user, const QString& pass );
+
+ /**
+ * Connects to a ftp server and logs us in
+ * @ref m_bLoggedOn is set to true if logging on was successfull.
+ * It is set to false if the connection becomes closed.
+ *
+ */
+ virtual void openConnection();
+
+ /**
+ * Closes the connection
+ */
+ virtual void closeConnection();
+
+ //virtual void stat( const KURL &url );
+
+ //virtual void listDir( const KURL & url );
+ //virtual void mkdir( const KURL & url, int permissions );
+ //virtual void rename( const KURL & src, const KURL & dst, bool overwrite );
+ //virtual void del( const KURL & url, bool isfile );
+ //virtual void chmod( const KURL & url, int permissions );
+
+ virtual void get( const KURL& url );
+ //virtual void put( const KURL& url, int permissions, bool overwrite, bool resume);
+ //virtual void mimetype( const KURL& url );
+
+ //virtual void slave_status();
+
+ // unsupported, AFAIK
+ // virtual void copy( const KURL &src, const KURL &dest, int permissions, bool overwrite );
+
+private:
+
+ // All the methods named ftpXyz do NOT emit errors, they simply return true
+ // or false (they are lowlevel methods). The methods not named this way
+ // emit error on error (they are highlevel methods).
+
+ /**
+ * Called by @ref openConnection. It opens the control connection to the ftp server.
+ *
+ * @return true on success.
+ */
+ bool connect( const QString & host, unsigned short int port = 0 );
+
+ /**
+ * Called by @ref openConnection. It logs us in.
+ * @ref m_initialPath is set to the current working directory
+ * if logging on was successfull.
+ *
+ * @return true on success.
+ */
+ bool ftpLogin();
+
+ /**
+ * ftpSendCmd - send a command (@p cmd) and read response
+ *
+ * @param expresp the expected first char, if you want the builtin check
+ * @param maxretries number of time it should retry. Since it recursively
+ * calls itself if it can't read the answer (this happens especially after
+ * timeouts), we need to limit the recursiveness ;-)
+ *
+ * return true if proper response received, false on error
+ * or if @p expresp doesn't match
+ */
+ bool ftpSendCmd( const QCString& cmd, char expresp = '\0', int maxretries = 1 );
+
+ /**
+ * Use the SIZE command to get the file size.
+ * @param mode the size depends on the transfer mode, hence this arg.
+ * @return true on success
+ * Gets the size into m_size.
+ */
+ bool ftpSize( const QString & path, char mode );
+
+ /**
+ * Runs a command on the ftp server like "list" or "retr". In contrast to
+ * @ref ftpSendCmd a data connection is opened. The corresponding socket
+ * @ref sData is available for reading/writing on success.
+ * The connection must be closed afterwards with @ref ftpCloseCommand.
+ *
+ * @param mode is 'A' or 'I'. 'A' means ASCII transfer, 'I' means binary transfer.
+ * @param errorcode the command-dependent error code to emit on error
+ *
+ * @return true if the command was accepted by the server.
+ */
+ bool ftpOpenCommand( const char *command, const QString & path, char mode,
+ int errorcode, unsigned long offset = 0 );
+
+ /**
+ * The counterpart to @ref openCommand.
+ * Closes data sockets and then reads line sent by server at
+ * end of command.
+ * @return false on error (line doesn't start with '2')
+ */
+ bool ftpCloseCommand();
+
+ void closeSockets();
+
+ //void ftpAbortTransfer();
+
+ /**
+ * Used by @ref openCommand
+ */
+ bool ftpOpenPASVDataConnection();
+ /**
+ * Used by @ref openCommand
+ */
+ bool ftpOpenEPSVDataConnection();
+ /**
+ * Used by @ref openCommand
+ */
+ bool ftpOpenEPRTDataConnection();
+ /**
+ * Used by @ref openCommand
+ */
+ bool ftpOpenDataConnection();
+ /**
+ * ftpAcceptConnect - wait for incoming connection
+ *
+ * return -2 on error or timeout
+ * otherwise returns socket descriptor
+ */
+ int ftpAcceptConnect();
+
+ size_t ftpRead( void *buffer, long len );
+ size_t ftpWrite( void *buffer, long len );
+
+ bool ftpChmod( const QString & path, int permissions );
+
+ // used by listDir
+ bool ftpOpenDir( const QString & path );
+ bool ftpCloseDir();
+ // return 0L on end
+ FtpEntry * ftpReadDir();
+ // used by ftpReadDir
+ FtpEntry * ftpParseDir( char* buffer );
+ void createUDSEntry( const QString & filename, FtpEntry * e, KIO::UDSEntry & entry, bool isDir );
+
+ bool ftpRename( const QString & src, const QString & dst, bool overwrite );
+
+ /**
+ * read a line of text
+ *
+ * return -1 on error, bytecount otherwise
+ */
+ int ftpReadline( char *buf, int max, netbuf *ctl );
+
+ /**
+ * read a response from the server, into rspbuf
+ * @return first char of response (rspbuf[0]), '\0' if we couldn't read the response
+ */
+ char readresp();
+
+ void getDir( const KURL& url);
+
+private: // data members
+
+ /**
+ * Connected to the socket from which we read a directory listing.
+ * If it is not zero, then a "list" command is in progress.
+ */
+ FILE *dirfile;
+
+ /**
+ * This is the data connection socket from which we read the data.
+ */
+ int sData;
+ /**
+ * The control stream socket
+ */
+ int sControl;
+ /**
+ * The server socket for a data connection. This is needed since the
+ * ftp server must open a connection to us.
+ */
+ int sDatal;
+
+ QString m_host;
+ int m_port;
+ QString m_user;
+ QString m_pass;
+ /**
+ * Where we end up after connecting
+ */
+ QString m_initialPath;
+ KURL m_proxyURL;
+
+ netbuf *nControl;
+ char rspbuf[256];
+
+ bool m_bLoggedOn;
+ bool m_bFtpStarted;
+ bool m_bPasv;
+ bool m_bUseProxy;
+ bool m_bPersistent;
+
+ size_t m_size;
+
+ enum
+ {
+ epsvUnknown = 0x01,
+ epsvAllUnknown = 0x02,
+ eprtUnknown = 0x04,
+ epsvAllSent = 0x10
+ };
+ int m_extControl;
+ KExtendedSocket *ksControl;
+
+};
+
+#endif

20
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_launcher_cpp
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-konq-embed_dropin_kio_launcher_cpp,v 1.1 2002/03/30 17:25:13 espie Exp $
--- konq-embed/dropin/kio/launcher.cpp.orig Sat Mar 30 17:12:06 2002
+++ konq-embed/dropin/kio/launcher.cpp Sat Mar 30 17:13:00 2002
@@ -36,6 +36,8 @@
#include <kio/slavebase.h>
#include <dcopdispatcher.h>
+extern void setupSignalHandler();
+
using namespace KIO;
Launcher *Launcher::s_self = 0;
@@ -233,6 +235,7 @@ void Launcher::dispatchLoop()
{
qDebug( "Launcher::dispatchLoop()..." );
+ setupSignalHandler();
while ( 42 )
{
LauncherMsg launcherMsg;

29
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_slavebase_cpp
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-konq-embed_dropin_kio_slavebase_cpp,v 1.1 2002/03/30 18:48:59 espie Exp $
--- konq-embed/dropin/kio/slavebase.cpp.orig Fri Feb 1 13:17:31 2002
+++ konq-embed/dropin/kio/slavebase.cpp Sat Mar 30 19:35:08 2002
@@ -29,6 +29,7 @@
#include "http.h"
#include "kio_file.h"
+#include "kio_ftp.h"
#include "slaveinterface.h"
#include "connection.h"
@@ -154,13 +155,16 @@ SlaveBase *SlaveBase::createSlave( const
#endif
else if ( prot == "file" )
res = new File();
+ else if ( prot == "ftp" )
+ res = new Ftp("", "" );
return res;
}
bool SlaveBase::knownProtocol( const QString &protocol )
{
- return ( protocol == "http" || protocol == "https" || protocol == "file" );
+ return ( protocol == "http" || protocol == "https" ||
+ protocol == "ftp" || protocol == "file" );
}
SlaveBase::SlaveBase( const QCString &protocol, const QCString &, const QCString & )

112
www/konqueror-embedded/patches/patch-konq-embed_dropin_kio_slaveconfig_h
View File

@ -1,112 +0,0 @@
$OpenBSD: patch-konq-embed_dropin_kio_slaveconfig_h,v 1.2 2002/03/30 22:02:13 espie Exp $
--- konq-embed/dropin/kio/slaveconfig.h.orig Sat Mar 30 21:25:50 2002
+++ konq-embed/dropin/kio/slaveconfig.h Sat Mar 30 21:25:40 2002
@@ -0,0 +1,108 @@
+// -*- c++ -*-
+/*
+ * This file is part of the KDE libraries
+ * Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
+ *
+ * $Id: patch-konq-embed_dropin_kio_slaveconfig_h,v 1.2 2002/03/30 22:02:13 espie Exp $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ **/
+
+#ifndef KIO_SLAVE_CONFIG_H
+#define KIO_SLAVE_CONFIG_H
+
+#include <qobject.h>
+#include <kio/global.h>
+
+namespace KIO {
+
+ class SlaveConfigPrivate;
+ /**
+ * SlaveConfig
+ *
+ * This class manages the configuration for io-slaves based on protocol
+ * and host. The Scheduler makes use of this class to configure the slave
+ * whenever it has to connect to a new host.
+ *
+ * You only need to use this class if you want to override specific
+ * configuration items of an io-slave when the io-slave is used by
+ * your application.
+ *
+ * Normally io-slaves are being configured by "kio_<protocol>rc"
+ * configuration files. Groups defined in such files are treated as host
+ * or domain specification. Configuration items defined in a group are
+ * only applied when the slave is connecting with a host that matches with
+ * the host and/or domain specified by the group.
+ */
+ class SlaveConfig : public QObject
+ {
+ Q_OBJECT
+ public:
+ static SlaveConfig *self();
+ ~SlaveConfig();
+ /**
+ * Configure slaves of type @p protocol by setting @p key to @p value.
+ * If @p host is specified the configuration only applies when dealing
+ * with @p host.
+ *
+ * Changes made to the slave configuration only apply to slaves
+ * used by the current process.
+ */
+ void setConfigData(const QString &protocol, const QString &host, const QString &key, const QString &value );
+
+ /**
+ * Configure slaves of type @p protocol with @p config.
+ * If @p host is specified the configuration only applies when dealing
+ * with @p host.
+ *
+ * Changes made to the slave configuration only apply to slaves
+ * used by the current process.
+ */
+ void setConfigData(const QString &protocol, const QString &host, const MetaData &config );
+
+ /**
+ * Query slave configuration for slaves of type @p protocol when
+ * dealing with @p host.
+ */
+ MetaData configData(const QString &protocol, const QString &host);
+
+ /**
+ * Query a specific configuration key for slaves of type @p protocol when
+ * dealing with @p host.
+ */
+ QString configData(const QString &protocol, const QString &host, const QString &key);
+
+ /**
+ * Undo any changes made by calls to @ref setConfigData.
+ */
+ void reset();
+ signals:
+ /**
+ * This signal is raised when a slave of type @p protocol deals
+ * with @p host for the first time.
+ *
+ * Your application can use this signal to make some last minute
+ * configuration changes with @ref setConfiguration based on the
+ * host.
+ */
+ void configNeeded(const QString &protocol, const QString &host);
+ protected:
+ SlaveConfig();
+ static SlaveConfig *_self;
+ SlaveConfigPrivate *d;
+ };
+};
+
+#endif

30
www/konqueror-embedded/patches/patch-konq-embed_dropin_klibloader_cpp
View File

@ -1,6 +1,5 @@
$OpenBSD: patch-konq-embed_dropin_klibloader_cpp,v 1.3 2002/03/25 00:35:41 brad Exp $
--- konq-embed/dropin/klibloader.cpp.orig Sun Feb 3 10:25:38 2002
+++ konq-embed/dropin/klibloader.cpp Sun Mar 24 02:09:01 2002
--- konq-embed/dropin/klibloader.cpp.orig Wed May 14 03:07:54 2003
+++ konq-embed/dropin/klibloader.cpp Fri May 16 20:50:38 2003
@@ -27,6 +27,8 @@
#include "kglobal.h"
#include <kstddirs.h>
@ -10,25 +9,28 @@ $OpenBSD: patch-konq-embed_dropin_klibloader_cpp,v 1.3 2002/03/25 00:35:41 brad
#include <assert.h>
#if defined(HAVE_DLFCN)
@@ -87,6 +89,17 @@ KDLOpenLibrary::~KDLOpenLibrary()
@@ -86,7 +88,19 @@ KDLOpenLibrary::~KDLOpenLibrary()
void *KDLOpenLibrary::symbol( const char *name )
{
void *res = dlsym( m_handle, name );
- return dlsym( m_handle, name );
+ void *res = dlsym( m_handle, name );
+#ifdef __OpenBSD__
+ if ( !res ) {
+ char *name2 = (char *)malloc(strlen(name)+2);
+ char *name2 = (char *)malloc(strlen(name)+2);
+ if (name2) {
+ name2[0] = '_';
+ strcpy(name2+1, name);
+ res = dlsym( m_handle, name2);
+ free(name2);
+ name2[0] = '_';
+ strcpy(name2+1, name);
+ res = dlsym( m_handle, name2);
+ free(name2);
+ }
+ }
+#endif
if ( !res )
res = KLibrary::symbol( name );
return res;
@@ -144,6 +157,9 @@ KLibrary *KLibLoader::library( const cha
+ return res;
}
#endif
@@ -141,6 +155,9 @@ KLibrary *KLibLoader::library( const cha
KLibrary *KLibLoader::globalLibrary( const char *name )
{

30
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_kopenssl_cc
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_kopenssl_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/kopenssl.cc.orig Tue Aug 21 12:07:31 2001
+++ konq-embed/kdesrc/kssl/kopenssl.cc Wed Aug 14 13:38:14 2002
@@ -92,6 +92,7 @@ static int (*K_SSL_CTX_use_certificate)
static int (*K_SSL_get_error) (SSL*, int) = NULL;
static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
static void (*K_sk_free) (STACK*) = NULL;
static int (*K_sk_num) (STACK*) = NULL;
static char* (*K_sk_value) (STACK*, int) = NULL;
@@ -254,6 +255,7 @@ KConfig *cfg;
X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse");
K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free");
K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
K_sk_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
@@ -742,6 +744,10 @@ char *KOpenSSLProxy::sk_value(STACK *s,
void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
+}
+
+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
+ if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
}

14
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_kopenssl_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_kopenssl_h,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/kopenssl.h.orig Fri Jul 27 05:55:02 2001
+++ konq-embed/kdesrc/kssl/kopenssl.h Wed Aug 14 13:38:14 2002
@@ -277,6 +277,10 @@ public:
*/
void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
+ /*
+ * X509_STORE_CTX_set_purpose - set the purpose of the certificate
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
/*
* X509_verify_cert - verify the certificate

12
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_kssl_ksslcertificate_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-konq-embed_kdesrc_kssl_ksslcertificate_cc,v 1.1 2002/08/16 19:49:27 brad Exp $
--- konq-embed/kdesrc/kssl/ksslcertificate.cc.orig Thu Oct 25 02:12:11 2001
+++ konq-embed/kdesrc/kssl/ksslcertificate.cc Wed Aug 14 13:43:06 2002
@@ -262,6 +262,8 @@ KSSLCertificate::KSSLValidation KSSLCert
// FIXME: do all the X509_STORE_CTX_set_flags(); here
// +-----> Note that this is for 0.9.6 or better ONLY!
+ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
+
//kdDebug(7029) << "KSSL verifying.............." << endl;
certStoreCTX->error = X509_V_OK;
rc = d->kossl->X509_verify_cert(certStoreCTX);

7
www/konqueror-embedded/pkg/PLIST
View File

@ -1,15 +1,19 @@
@comment $OpenBSD: PLIST,v 1.3 2002/03/25 00:35:41 brad Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/05/19 18:21:34 brad Exp $
bin/konq-e
lib/konq-e/apps/Applications/konqueror.desktop
lib/konq-e/pics/konqueror.png
lib/konq-e/share/apps/khtml/css/html4.css
lib/konq-e/share/apps/kplaintextpart/kplaintextpart.rc
lib/konq-e/share/apps/kssl/caroot/ca-bundle.crt
lib/konq-e/share/config/charsets
lib/konq-e/share/config/khtmlrc
lib/konq-e/share/services/kplaintextpart.desktop
libexec/konq-e
@dirrm lib/konq-e/share/services
@dirrm lib/konq-e/share/config
@dirrm lib/konq-e/share/apps/kssl/caroot
@dirrm lib/konq-e/share/apps/kssl
@dirrm lib/konq-e/share/apps/kplaintextpart
@dirrm lib/konq-e/share/apps/khtml/css
@dirrm lib/konq-e/share/apps/khtml
@dirrm lib/konq-e/share/apps
@ -17,3 +21,4 @@ libexec/konq-e
@dirrm lib/konq-e/pics
@dirrm lib/konq-e/apps/Applications
@dirrm lib/konq-e/apps
@dirrm lib/konq-e