diff options
69 files changed, 0 insertions, 5504 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile deleted file mode 100644 index 85127e201604..000000000000 --- a/net/samba/Makefile +++ /dev/null @@ -1,318 +0,0 @@ -# New ports collection makefile for: samba -# Date created: 11th Feb 1995 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= samba -PORTVERSION= 2.2.12 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SAMBA} -MASTER_SITE_SUBDIR= . old-versions - -.if defined(WITH_JAIL) -# This patch was originally created by Gerhard Sittig <Gerhard.Sittig@gmx.net> -# See PR ports/22316 -# Reworked/updated and portsified by anders@FreeBSD.org, 2003-11-08 -PATCH_SITES+= ftp://totem.fix.no/pub/mirrors/misc/:smbjail \ - ftp://ftp.nuug.no/pub/anders/distfiles/:smbjail -PATCHFILES+= samba-2.2.10-freebsd-jail-patch-20040806.gz:smbjail -.endif -.if defined(WITH_BROWSING_HACKS) -PATCH_SITES+= http://cell.sick.ru/~glebius/patches/ \ - http://people.FreeBSD.org/~glebius/ -PATCHFILES+= samba-2.2.9-browsing-hacks.diff -.endif - -MAINTAINER= ports@FreeBSD.org -COMMENT= A free SMB and CIFS client and server for UNIX - -FORBIDDEN= http://vuxml.FreeBSD.org/3b3676be-52e1-11d9-a9e7-0001020eed82.html -EXPIRATION_DATE=2006-08-20 - -CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* -USE_SUBMAKE= YES -USE_GMAKE= YES -USE_AUTOTOOLS= autoconf:213 libtool:15 - -# directories -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -AUDIT?= "@comment " -RECYCLE?= "@comment " -LIBSAMBA?= "@comment " -BUILD_VFS?= "@comment " -WINBIND?= "@comment " -WINBIND_NSS?= "@comment " -WINBIND_AUTH_CHALLENGE?= "@comment " - -.if defined(WITH_AUDIT) -AUDIT= "" -LIBSAMBA= "" -BUILD_VFS= "" -.endif - -.if defined(WITH_RECYCLE) -RECYCLE= "" -LIBSAMBA= "" -BUILD_VFS= "" -.endif - -VARDIR= /var -SAMBA_SPOOL= ${VARDIR}/spool/samba -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - CAT="${CAT}" \ - SAMBA_OPTIONS="${SAMBA_OPTIONS}" \ - REALCURDIR="${.CURDIR}" - -SAMBA_LOGDIR?= ${VARDIR}/log -SAMBA_PRIVATE?= ${PREFIX}/private -SAMBA_CONFDIR?= ${PREFIX}/etc -SAMBA_VFSDIR?= ${PREFIX}/lib/samba - -# sample files -STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/samba.sh.sample -SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default - -CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \ - --localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \ - --with-sambabook=${PREFIX}/share/swat/using_samba \ - --with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \ - --with-pam --with-piddir=${VARDIR}/run \ - --with-logfilebase=${SAMBA_LOGDIR} - -.include <bsd.port.pre.mk> - -CONFIGURE_ENV+= TESTDIR=/tmp - -.if defined(WITH_SYSLOG) -CONFIGURE_ARGS+= --with-syslog -.endif - -.if defined(WITH_SSL) -CONFIGURE_ARGS+= --with-ssl --with-sslinc=/usr/include/openssl --with-ssllib=/usr/lib -.endif - -.if defined(WITH_QUOTAS) -CONFIGURE_ARGS+= --with-quotas -.endif - -.if defined(WITH_UTMP) -CONFIGURE_ARGS+= --with-utmp -.endif - -.if defined(WITH_MSDFS) -CONFIGURE_ARGS+= --with-msdfs -.endif - -.if defined(WITH_INCLUDED_POPT) -CONFIGURE_ARGS+= --with-included-popt -.else -LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt -.endif - -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldapsam -CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib -.endif - -.if !defined(WITHOUT_CUPS) -WITH_CUPS= yes -.endif - -.if defined(WITH_WINBIND) -CONFIGURE_ARGS+= --with-winbind -WINBIND= "" -.else -CONFIGURE_ARGS+= --without-winbind -.endif - -.if defined(WITH_WINBIND_NSS) -.if ${OSVERSION} < 500112 -BROKEN= NSS modules only supported on FreeBSD 5.1 or later -.else -WINBIND_NSS= "" -.endif -.endif - -.if defined(WITH_WINBIND_AUTH_CHALLENGE) -CONFIGURE_ARGS+= --with-winbind-auth-challenge -WINBIND_AUTH_CHALLENGE= "" -.endif - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.samba - -post-patch: - ${FIND} ${PATCH_WRKSRC} -type f -name '*.orig' -exec ${RM} {} \; - ${FIND} ${PATCH_WRKSRC} -type f -empty -exec ${RM} {} \; - ${CP} ${FILESDIR}/winbind_nss_bsd.c ${WRKSRC}/nsswitch/ - ${CHMOD} a+x ${WRKSRC}/../examples/VFS/configure - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base -CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-cups -.endif - -.if defined(KRB5_HOME) && exists(${KRB5_HOME}) -CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME} -.endif - -.if defined(WITH_ACL_SUPPORT) -.if ${OSVERSION} < 500018 -BROKEN= "ACL support requires a recent FreeBSD 5.0-CURRENT" -.else -CONFIGURE_ARGS+= --with-acl-support -.endif -.endif - -WRKSRC= ${WRKDIR}/${DISTNAME}/source -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} - -LIBTOOLFILES= ${WRKSRC}/aclocal.m4 - -MAN1= findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \ - nmblookup.1 smbcacls.1 smbclient.1 smbcontrol.1 \ - smbsh.1 smbstatus.1 smbtar.1 testparm.1 \ - testprns.1 wbinfo.1 -MAN5= lmhosts.5 smb.conf.5 smbpasswd.5 -MAN7= samba.7 -MAN8= nmbd.8 pdbedit.8 smbd.8 smbmnt.8 smbmount.8 \ - smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 - -SED_PLIST= ${SED} -e 's!${PREFIX}!%D!g' - -PLIST_SUB= AUDIT=${AUDIT} \ - RECYCLE=${RECYCLE} \ - LIBSAMBA=${LIBSAMBA} \ - BUILD_VFS=${BUILD_VFS} \ - WINBIND=${WINBIND} \ - WINBIND_NSS=${WINBIND_NSS} \ - WINBIND_AUTH_CHALLENGE=${WINBIND_AUTH_CHALLENGE} - -.if defined(WITH_RECYCLE) || defined(WITH_AUDIT) -post-build: - cd ${WRKDIR}/${DISTNAME}/examples/VFS; \ - LIBTOOL=${LIBTOOL} ./configure;${GMAKE}; \ - ${RM} -f config.cache config.log config.status -.endif - -pre-build: - ${RM} -fr ${WRKSRC}/include/proto.h - (cd ${WRKSRC} && make proto) - ${SED} -e 's!%%PREFIX%%!${PREFIX}!' \ - ${FILESDIR}/samba.sh.sample > ${WRKDIR}/samba.sh.sample - -post-install: -.if defined(WITH_WINBIND_NSS) - ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib/nss_winbind.so.1 -.endif -.if defined(WITH_AUDIT) || defined(WITH_RECYCLE) - @test -d ${SAMBA_VFSDIR} || ${MKDIR} ${SAMBA_VFSDIR} -.if defined(WITH_AUDIT) - ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/audit.so ${SAMBA_VFSDIR} -.endif -.if defined(WITH_RECYCLE) - ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.so ${SAMBA_VFSDIR} - @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.conf \ - ${SAMBA_CONFDIR}/recycle.conf.default -.endif -.endif - ${MKDIR} ${PREFIX}/share/examples/samba - -${RM} -f ${WRKDIR}/${DISTNAME}/examples/libsmbclient/*.o - ${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba -.if defined(WITH_AUDIT) || defined(WITH_RECYCLE) -# @${RM} -rf ${PREFIX}/share/examples/samba/VFS/.libs - ${FIND} ${PREFIX}/share/examples/samba/VFS -type d -name ".libs" | ${XARGS} ${RM} -r - @for ifile in audit.o audit.so recycle/recycle.o recycle/recycle.so skel.o skel.so ; do \ - ${RM} ${PREFIX}/share/examples/samba/VFS/$${ifile} ; \ - done -.endif - @if [ ! -f ${STARTUP_SCRIPT} ]; then \ - ${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ; \ - ${INSTALL_SCRIPT} ${WRKDIR}/samba.sh.sample \ - ${STARTUP_SCRIPT} ; \ - fi - @test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL} - @if [ ! -f ${SAMPLE_CONFIG} ]; then \ - ${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!' \ - -e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!' \ - -e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!' \ - -e 's!%%SAMBA_VFSDIR%%!${SAMBA_VFSDIR}!' \ - ${FILESDIR}/smb.conf.default \ - > ${SAMPLE_CONFIG} ; \ - fi - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd - if [ ! -d ${SAMBA_PRIVATE} ] ; then \ - ${MKDIR} ${SAMBA_PRIVATE} ; \ - ${CHOWN} root:wheel ${SAMBA_PRIVATE} ; \ - fi - ${CHMOD} 700 ${SAMBA_PRIVATE} - if [ ! -f ${SAMBA_PRIVATE}/smbpasswd.default ] ; then \ - ${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default ; \ - ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd.default ; \ - fi - if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then \ - ${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd ; \ - ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ; \ - fi - ${CHMOD} 500 ${SAMBA_PRIVATE} - ${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd - ${CHMOD} 111 ${PREFIX}/bin/smbpasswd - ${ECHO_CMD} "@exec ${TEST} -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@exec ${MKDIR} -m 500 ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@exec ${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@exec ${TEST} -e ${SAMBA_PRIVATE}/smbpasswd || ${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@exec ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@unexec /usr/bin/cmp -s ${SAMBA_PRIVATE}/smbpasswd ${SAMBA_PRIVATE}/smbpasswd.default && ${RM} -f ${SAMBA_PRIVATE}/smbpasswd || ${TRUE}" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@unexec ${RM} -f ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST} - ${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} || (${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore,\" && ${ECHO_CMD} \" please remove ${SAMBA_PRIVATE} and its contents manually.\")" | ${SED_PLIST} >> ${TMPPLIST} - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR} - for i in ${WRKDIR}/${DISTNAME}/README \ - ${WRKDIR}/${DISTNAME}/COPYING \ - ${WRKDIR}/${DISTNAME}/Manifest \ - ${WRKDIR}/${DISTNAME}/Roadmap \ - ${WRKDIR}/${DISTNAME}/WHATSNEW.txt \ - ${WRKDIR}/${DISTNAME}/docs/THANKS \ - ${WRKDIR}/${DISTNAME}/docs/announce \ - ${WRKDIR}/${DISTNAME}/docs/history ; do \ - ${INSTALL_DATA} $$i ${DOCSDIR} ; \ - done - for i in faq htmldocs textdocs Registry ; do \ - ${MKDIR} ${DOCSDIR}/$$i ; \ - for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do \ - if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \ - if [ $$j != ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated ] ; then \ - ${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\ - fi; \ - fi; \ - done \ - done - @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net/samba/distinfo b/net/samba/distinfo deleted file mode 100644 index 794475944ce7..000000000000 --- a/net/samba/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (samba-2.2.12.tar.gz) = ffda6f5a93635d0b2afb2b2fb17e3bbf -SHA256 (samba-2.2.12.tar.gz) = 4fdebbd1307405892dfb0037b7f8dee03eba32cf8d839dc41046d7b98c8baf34 -SIZE (samba-2.2.12.tar.gz) = 5459704 -MD5 (samba-2.2.10-freebsd-jail-patch-20040806.gz) = c38006077a83bb28ae7672df477834b2 -SHA256 (samba-2.2.10-freebsd-jail-patch-20040806.gz) = 615b81f18480e4e37d3fee30694c5f892c11069e76a1d54cbf11bb583b49c69d -SIZE (samba-2.2.10-freebsd-jail-patch-20040806.gz) = 2959 -MD5 (samba-2.2.9-browsing-hacks.diff) = 39f95cdb2f9833b4eec7a05000fe2cbf -SHA256 (samba-2.2.9-browsing-hacks.diff) = 3510667bf22ca9eafcc200561d2093b496baacd07a34f781ef008bcbb1d55848 -SIZE (samba-2.2.9-browsing-hacks.diff) = 59834 diff --git a/net/samba/files/README.FreeBSD b/net/samba/files/README.FreeBSD deleted file mode 100644 index c1703e5297a7..000000000000 --- a/net/samba/files/README.FreeBSD +++ /dev/null @@ -1,19 +0,0 @@ -If you want to use samba ports, - -1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit - it. -2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh -3. Type /usr/local/etc/rc.d/samba.sh or reboot. - -See document files in /usr/local/share/doc/samba and example config files in -/usr/local/share/examples/samba for details. - -FreeBSD Samba ports for localization and encrypt passwords support are no -longer provided because these supports have been integrated into the -original distribution since 1.9.18. If you're Western European, Japanese, -or Chinese Windows users, please set "client code page" parameter in smb.conf. -See smb.conf.sample for details. If you want to use NT4+SP3 or Win95+updates -clients, set "encrypt passwords" parameter to yes and use smbpasswd [username] -to use /usr/local/private/smbpasswd for authentication. - -FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org> diff --git a/net/samba/files/patch-aj b/net/samba/files/patch-aj deleted file mode 100644 index 88f6c60d7ad0..000000000000 --- a/net/samba/files/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ ---- source/include/local.h.orig Fri Jul 6 03:01:26 2001 -+++ source/include/local.h Tue Oct 16 17:20:36 2001 -@@ -176,10 +176,10 @@ - * Default passwd chat script. - */ - --#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" -+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n" - - /* Minimum length of allowed password when changing UNIX password. */ --#define MINPASSWDLENGTH 5 -+#define MINPASSWDLENGTH 6 - - /* maximum ID number used for session control. This cannot be larger - than 62*62 for the current code */ diff --git a/net/samba/files/patch-ba b/net/samba/files/patch-ba deleted file mode 100644 index e9824c885c59..000000000000 --- a/net/samba/files/patch-ba +++ /dev/null @@ -1,11 +0,0 @@ ---- source/configure.in.orig Thu Aug 29 07:05:30 2002 -+++ source/configure.in Sat Sep 7 20:54:21 2002 -@@ -1914,7 +1914,7 @@ - yes) - AC_MSG_RESULT(yes) - AC_DEFINE(KRB5_AUTH) -- LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err" -+ LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err" - CFLAGS="$CFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - ;; diff --git a/net/samba/files/patch-configure.in b/net/samba/files/patch-configure.in deleted file mode 100644 index 02f346dac92c..000000000000 --- a/net/samba/files/patch-configure.in +++ /dev/null @@ -1,32 +0,0 @@ -*** source/configure.in.orig Wed Apr 16 20:59:48 2003 ---- source/configure.in Wed Apr 16 21:00:36 2003 -*************** -*** 170,176 **** - AC_SUBST(LIBSMBCLIENT) - - # compile with optimization and without debugging by default -! CFLAGS="-O ${CFLAGS}" - - AC_ARG_ENABLE(debug, - [ --enable-debug Turn on compiler debugging information (default=no)], ---- 170,176 ---- - AC_SUBST(LIBSMBCLIENT) - - # compile with optimization and without debugging by default -! CFLAGS="${CFLAGS}" - - AC_ARG_ENABLE(debug, - [ --enable-debug Turn on compiler debugging information (default=no)], -*************** -*** 2954,2959 **** ---- 2954,2963 ---- - *linux*|*irix*) - HAVE_WINBIND=yes - ;; -+ *freebsd5*) -+ HAVE_WINBIND=yes -+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_bsd.o" -+ ;; - *solaris*) - HAVE_WINBIND=yes - WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o" diff --git a/net/samba/files/patch-examples-VFS-Makefile.in b/net/samba/files/patch-examples-VFS-Makefile.in deleted file mode 100644 index 523622d7701d..000000000000 --- a/net/samba/files/patch-examples-VFS-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ ---- examples/VFS/Makefile.in.orig Thu Aug 12 20:24:58 2004 -+++ examples/VFS/Makefile.in Wed Aug 31 22:11:55 2005 -@@ -17,11 +17,11 @@ - - %.so: %.lo - @echo Linking $< -- @$(LIBTOOL) --mode=link $(CC) -o $@ $< $(LDFLAGS) -+ @$(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $< $(LDFLAGS) - - %.lo: %.c - @echo Compiling $< -- @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ -+ @$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - - # Misc targets - diff --git a/net/samba/files/patch-source::nsswitch::pam_winbind.h b/net/samba/files/patch-source::nsswitch::pam_winbind.h deleted file mode 100644 index 4164f1b43dd3..000000000000 --- a/net/samba/files/patch-source::nsswitch::pam_winbind.h +++ /dev/null @@ -1,19 +0,0 @@ ---- source/nsswitch/pam_winbind.h.orig Tue Apr 1 12:57:33 2003 -+++ source/nsswitch/pam_winbind.h Tue Apr 1 12:57:41 2003 -@@ -25,7 +25,15 @@ - #define PAM_SM_ACCOUNT - #define PAM_SM_PASSWORD - --#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) -+#if (__FreeBSD__ == 0) /* 1.0 did not define __FreeBSD__ */ -+#define __FreeBSD_version 199401 -+#elsif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */ -+#define __FreeBSD_version 199405 -+#else /* 2.0 and higher define it to be 2 */ -+#include <osreldate.h> /* and this works */ -+#endif -+ -+#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || (defined (__FreeBSD_version) && (__FreeBSD_version > 500030)) - - /* Solaris always uses dynamic pam modules */ - #define PAM_EXTERN extern diff --git a/net/samba/files/patch-source::rpcclient::cmd_reg.c b/net/samba/files/patch-source::rpcclient::cmd_reg.c deleted file mode 100644 index 0af2a8c3ddf7..000000000000 --- a/net/samba/files/patch-source::rpcclient::cmd_reg.c +++ /dev/null @@ -1,24 +0,0 @@ ---- source/rpcclient/cmd_reg.c.orig Thu Nov 27 12:17:08 2003 -+++ source/rpcclient/cmd_reg.c Thu Nov 27 12:19:24 2003 -@@ -900,6 +900,9 @@ - { - extern char *optarg; - extern int optind; -+#if defined(__FreeBSD__) -+ extern int optreset; -+#endif - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - fstring msg; - uint32 timeout = 20; -@@ -907,7 +910,11 @@ - int opt; - - *msg = 0; -+#if defined(__FreeBSD__) -+ optreset = optind = 1; -+#else - optind = 0; /* TODO: test if this hack works on other systems too --simo */ -+#endif - - while ((opt = getopt(argc, argv, "m:t:rf")) != EOF) - { diff --git a/net/samba/files/patch-source::smbd::trans2.c b/net/samba/files/patch-source::smbd::trans2.c deleted file mode 100644 index b5a01c5462dd..000000000000 --- a/net/samba/files/patch-source::smbd::trans2.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- source/smbd/trans2.c 2003/03/07 23:35:00 1.149.4.98 -+++ source/smbd/trans2.c 2003/03/25 23:50:47 1.149.4.99 -@@ -3043,7 +3043,7 @@ - { - char *params = *pparams; - enum remote_arch_types ra_type = get_remote_arch(); -- BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)); -+ BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3)); - pstring pathname; - int reply_size = 0; - int max_referral_level; diff --git a/net/samba/files/patch-sysv b/net/samba/files/patch-sysv deleted file mode 100644 index e1193c79ef75..000000000000 --- a/net/samba/files/patch-sysv +++ /dev/null @@ -1,7 +0,0 @@ ---- source/include/includes.h.orig Wed Dec 11 06:55:42 2002 -+++ source/include/includes.h Sun Feb 16 16:44:53 2003 -@@ -757,3 +757,3 @@ - /* this guess needs to be improved (tridge) */ --#if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) -+#if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) && !defined(__FreeBSD__) - #define SYSV 1 diff --git a/net/samba/files/patch-util_sec.c b/net/samba/files/patch-util_sec.c deleted file mode 100644 index a49ddcc6a8bf..000000000000 --- a/net/samba/files/patch-util_sec.c +++ /dev/null @@ -1,15 +0,0 @@ -*** source/lib/util_sec.c Wed Jul 17 15:47:49 2002 ---- source/lib/util_sec.c.neu Mon Jun 2 15:30:43 2003 -*************** -*** 112,119 **** ---- 112,121 ---- - (int)rgid, (int)egid, - (int)getgid(), (int)getegid(), - (int)getuid(), (int)geteuid())); -+ #if 0 - smb_panic("failed to set gid\n"); - exit(1); -+ #endif - } - } - } diff --git a/net/samba/files/patch-vfs.c b/net/samba/files/patch-vfs.c deleted file mode 100644 index d615eec537ba..000000000000 --- a/net/samba/files/patch-vfs.c +++ /dev/null @@ -1,29 +0,0 @@ ---- source/smbd/vfs.c.ORI Wed Sep 29 19:37:44 2004 -+++ source/smbd/vfs.c Fri Apr 22 21:11:57 2005 -@@ -717,6 +717,7 @@ - pstring savedir; - pstring realdir; - size_t reallen; -+ int linklen; - - if (!vfs_GetWd(conn, savedir)) { - DEBUG(0,("couldn't vfs_GetWd for %s %s\n", name, dir)); -@@ -740,12 +741,16 @@ - realdir[reallen] = 0; - } - -- if (conn->vfs_ops.readlink(conn, name, flink, sizeof(pstring) -1) != -1) { -+ if( (linklen = conn->vfs_ops.readlink(conn, name, flink, sizeof(pstring) -1)) != -1 ) { -+ flink[linklen] = '\0'; - DEBUG(3,("reduce_name: file path name %s is a symlink\nChecking it's path\n", name)); - if (*flink == '/') { - pstrcpy(cleanlink, flink); - } else { -- pstrcpy(cleanlink, realdir); -+ char* cp; -+ pstrcpy( cleanlink, name ); -+ if( (cp = strrchr( cleanlink, '/' )) != NULL ) -+ *cp = '\0'; - pstrcat(cleanlink, "/"); - pstrcat(cleanlink, flink); - } diff --git a/net/samba/files/samba.sh.sample b/net/samba/files/samba.sh.sample deleted file mode 100644 index 04bf048e2164..000000000000 --- a/net/samba/files/samba.sh.sample +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -smbspool=/var/spool/samba -pidfiledir=/var/run -smbd=%%PREFIX%%/sbin/smbd -nmbd=%%PREFIX%%/sbin/nmbd - -case "$1" in -start) - if [ -f $smbd ]; then - if [ -d $smbspool ]; then - rm -f $smbspool/* - fi - echo -n ' Samba' - $smbd -D - $nmbd -D - fi - ;; -stop) - kill `cat $pidfiledir/smbd.pid` - kill `cat $pidfiledir/nmbd.pid` - ;; -*) - echo "Usage: ${0##*/}: { start | stop }" >&2 - exit 64 - ;; -esac diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default deleted file mode 100644 index 7a374a341ff9..000000000000 --- a/net/samba/files/smb.conf.default +++ /dev/null @@ -1,296 +0,0 @@ -# This is the main Samba configuration file. You should read the -# smb.conf(5) manual page in order to understand the options listed -# here. Samba has a huge number of configurable options (perhaps too -# many!) most of which are not shown in this example -# -# Any line which starts with a ; (semi-colon) or a # (hash) -# is a comment and is ignored. In this example we will use a # -# for commentry and a ; for parts of the config file that you -# may wish to enable -# -# NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not many any basic syntactic errors. -# -#======================= Global Settings ===================================== -[global] - -# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4 - workgroup = MYGROUP - -# server string is the equivalent of the NT Description field - server string = Samba Server - -# This option is important for security. It allows you to restrict -# connections to machines which are on your local network. The -# following example restricts access to two C class networks and -# the "loopback" interface. For more examples of the syntax see -# the smb.conf man page -; hosts allow = 192.168.1. 192.168.2. 127. - -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this - load printers = yes - -# you may wish to override the location of the printcap file -; printcap name = /etc/printcap - -# on SystemV system setting printcap name to lpstat should allow -# you to automatically obtain a printer list from the SystemV spool -# system -; printcap name = lpstat - -# It should not be necessary to specify the print system type unless -# it is non-standard. Currently supported print systems include: -# bsd, sysv, plp, lprng, aix, hpux, qnx -; printing = bsd - -# Uncomment this if you want a guest account, you must add this to /etc/passwd -# otherwise the user "nobody" is used -; guest account = pcguest - -# this tells Samba to use a separate log file for each machine -# that connects - log file = %%SAMBA_LOGDIR%%/log.%m - -# Put a capping on the size of the log files (in Kb). - max log size = 50 - -# Security mode. Most people will want user level security. See -# security_level.txt for details. - security = user - -# Use password server option only with security = server -# The argument list may include: -# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] -# or to auto-locate the domain controller/s -# password server = * -; password server = <NT-Server-Name> - -# Note: Do NOT use the now deprecated option of "domain controller" -# This option is no longer implemented. - -# You may wish to use password encryption. Please read -# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. -# Do not enable this option unless you have read those documents -; encrypt passwords = yes - -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = %%SAMBA_CONFDIR%%/smb.conf.%m - -# Most people will find that this option gives better performance. -# See speed.txt and the manual pages for details -# You may want to add the following on a Linux system: -# SO_RCVBUF=8192 SO_SNDBUF=8192 - socket options = TCP_NODELAY - -# Configure Samba to use multiple interfaces -# If you have multiple network interfaces then you must list them -# here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 - -# Browser Control Options: -# set local master to no if you don't want Samba to become a master -# browser on your network. Otherwise the normal election rules apply -; local master = no - -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 33 - -# Domain Master specifies Samba to be the Domain Master Browser. This -# allows Samba to collate browse lists between subnets. Don't use this -# if you already have a Windows NT domain controller doing this job -; domain master = yes - -# Preferred Master causes Samba to force a local browser election on startup -# and gives it a slightly higher chance of winning the election -; preferred master = yes - -# Enable this if you want Samba to be a domain logon server for -# Windows95 workstations. -; domain logons = yes - -# if you enable domain logons then you may want a per-machine or -# per user logon script -# run a specific logon batch file per workstation (machine) -; logon script = %m.bat -# run a specific logon batch file per username -; logon script = %U.bat - -# Where to store roving profiles (only for Win95 and WinNT) -# %L substitutes for this servers netbios name, %U is username -# You must uncomment the [Profiles] share below -; logon path = \\%L\Profiles\%U - -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = yes - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# WINS Proxy - Tells Samba to answer name resolution queries on -# behalf of a non WINS capable client, for this to work there must be -# at least one WINS Server on the network. The default is NO. -; wins proxy = yes - -# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names -# via DNS nslookups. The built-in default for versions 1.9.17 is yes, -# this has been changed in version 1.9.18 to no. - dns proxy = no - -# Client codepage settings - -# for Greek users -; client code page=737 - -# for European users (Latin 1) -; client code page=850 - -# for European users (Latin 2) -; client code page=852 - -# for Icelandic users -; client code page=861 - -# for Cyrillic users -; client code page=866 - -# for Japanese Users -; client code page=932 -; coding system=cap - -# for Simplified Chinese Users -; client code page=936 -; coding system=cap - -# for Korean Users -; client code page=949 -; coding system=cap - -# for Traditional Chinese Users -; client code page=950 -; coding system=cap - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = no - writeable = yes -# Un-comment the following two lines to add a recycle bin facility to a samba share -# NOTE: It currently doesn't work with the [homes] virtual share, use a regular share instead -; vfs object = %%SAMBA_VFSDIR%%/recycle.so -; vfs options= %%SAMBA_CONFDIR%%/recycle.conf.default - -# Un-comment the following and create the netlogon directory for Domain Logons -; [netlogon] -; comment = Network Logon Service -; path = /usr/local/samba/lib/netlogon -; guest ok = yes -; writeable = no -; share modes = no - - -# Un-comment the following to provide a specific roving profile share -# the default is to use the user's home directory -;[Profiles] -; path = /usr/local/samba/profiles -; browseable = no -; guest ok = yes - - -# NOTE: If you have a BSD-style print system there is no need to -# specifically define each individual printer -[printers] - comment = All Printers - path = %%SAMBA_SPOOL%% - browseable = no -# Set public = yes to allow user 'guest account' to print - guest ok = no - writeable = no - printable = yes - -# This one is useful for people to share files -;[tmp] -; comment = Temporary file space -; path = /tmp -; read only = no -; public = yes - -# A publicly accessible directory, but read only, except for people in -# the "staff" group -;[public] -; comment = Public Stuff -; path = /home/samba -; public = yes -; writeable = yes -; printable = no -; write list = @staff - -# Other examples. -# -# A private printer, usable only by fred. Spool data will be placed in fred's -# home directory. Note that fred must have write access to the spool directory, -# wherever it is. -;[fredsprn] -; comment = Fred's Printer -; valid users = fred -; path = /homes/fred -; printer = freds_printer -; public = no -; writeable = no -; printable = yes - -# A private directory, usable only by fred. Note that fred requires write -# access to the directory. -;[fredsdir] -; comment = Fred's Service -; path = /usr/somewhere/private -; valid users = fred -; public = no -; writeable = yes -; printable = no - -# a service which has a different directory for each machine that connects -# this allows you to tailor configurations to incoming machines. You could -# also use the %U option to tailor it by user name. -# The %m gets replaced with the machine name that is connecting. -;[pchome] -; comment = PC Directories -; path = /usr/pc/%m -; public = no -; writeable = yes - -# A publicly accessible directory, read/write to all users. Note that all files -# created in the directory by users will be owned by the default user, so -# any user with access can delete any other user's files. Obviously this -# directory must be writeable by the default user. Another user could of course -# be specified, in which case all files would be owned by that user instead. -;[public] -; path = /usr/somewhere/else/public -; public = yes -; only guest = yes -; writeable = yes -; printable = no -# Un-comment the following two lines to add a recycle bin facility to a samba share -; vfs object = %%SAMBA_VFSDIR%%/recycle.so -; vfs options= %%SAMBA_CONFDIR%%/recycle.conf.default - -# The following two entries demonstrate how to share a directory so that two -# users can place files there that will be owned by the specific users. In this -# setup, the directory should be writeable by both users and should have the -# sticky bit set on it to prevent abuse. Obviously this could be extended to -# as many users as required. -;[myshare] -; comment = Mary's and Fred's stuff -; path = /usr/somewhere/shared -; valid users = mary fred -; public = no -; writeable = yes -; printable = no -; create mask = 0765 - - diff --git a/net/samba/files/winbind_nss_bsd.c b/net/samba/files/winbind_nss_bsd.c deleted file mode 100644 index 2d93584fc535..000000000000 --- a/net/samba/files/winbind_nss_bsd.c +++ /dev/null @@ -1,61 +0,0 @@ -#include <sys/param.h> -#if __FreeBSD_version >= 500112 -#include <pwd.h> -#include <grp.h> -#include <nss.h> - -extern enum nss_status _nss_winbind_getgrent_r(struct group *, char *, size_t, - int *); -extern enum nss_status _nss_winbind_getgrnam_r(const char *, struct group *, - char *, size_t, int *); -extern enum nss_status _nss_winbind_getgrgid_r(gid_t gid, struct group *, char *, - size_t, int *); -extern enum nss_status _nss_winbind_setgrent(void); -extern enum nss_status _nss_winbind_endgrent(void); - -extern enum nss_status _nss_winbind_getpwent_r(struct passwd *, char *, size_t, - int *); -extern enum nss_status _nss_winbind_getpwnam_r(const char *, struct passwd *, - char *, size_t, int *); -extern enum nss_status _nss_winbind_getpwuid_r(gid_t gid, struct passwd *, char *, - size_t, int *); -extern enum nss_status _nss_winbind_setpwent(void); -extern enum nss_status _nss_winbind_endpwent(void); - -NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); -NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); -NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); -NSS_METHOD_PROTOTYPE(__nss_compat_setgrent); -NSS_METHOD_PROTOTYPE(__nss_compat_endgrent); - -NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); -NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); -NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); -NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); -NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); - -static ns_mtab methods[] = { -{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r }, -{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_winbind_getgrgid_r }, -{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r }, -{ NSDB_GROUP, "endgrent", __nss_compat_setgrent, _nss_winbind_setgrent }, -{ NSDB_GROUP, "setgrent", __nss_compat_endgrent, _nss_winbind_endgrent }, - -{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r }, -{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r }, -{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_winbind_getpwent_r }, -{ NSDB_PASSWD, "endpwent", __nss_compat_setpwent, _nss_winbind_setpwent }, -{ NSDB_PASSWD, "setpwent", __nss_compat_endpwent, _nss_winbind_endpwent }, - -}; - - -ns_mtab * -nss_module_register(const char *source, unsigned int *mtabsize, - nss_module_unregister_fn *unreg) -{ - *mtabsize = sizeof(methods)/sizeof(methods[0]); - *unreg = NULL; - return (methods); -} -#endif diff --git a/net/samba/pkg-descr b/net/samba/pkg-descr deleted file mode 100644 index b49d3d9ac57c..000000000000 --- a/net/samba/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The Samba suite is a set of programs which run under the FreeBSD -operating system. These programs deliver most of the important -functionality of a Microsoft Lan Manager server. That is, they support -remote access to FreeBSD filespace and FreeBSD printers from Lan Manager -compatible clients. In practical terms, this means that such clients -can connect to and use FreeBSD filespace as if it was a local disk drive, -or FreeBSD printers as if they were local printers. - -Some of the most popular Lan Manager compatible clients include Lan -Manager itself, Windows for Workgroups, OS/2 and Windows NT. - -WWW: http://www.samba.org/ diff --git a/net/samba/pkg-message b/net/samba/pkg-message deleted file mode 100644 index 44547dd38d73..000000000000 --- a/net/samba/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -======================================================================= - -WARNING: In FreeBSD, it's known that compiling samba with any kind of -optimization flags might cause problems under certain circumstance. - -If you caught any show stopper, please try taking optimization flag(s) -out of your CFLAGS and recompile/reinstall samba. - -======================================================================= diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist deleted file mode 100644 index 1ec8e09944a9..000000000000 --- a/net/samba/pkg-plist +++ /dev/null @@ -1,540 +0,0 @@ -bin/findsmb -bin/make_printerdef -bin/make_smbcodepage -bin/make_smbpasswd -bin/make_unicodemap -bin/nmblookup -bin/rpcclient -bin/smbcacls -bin/smbclient -bin/smbcontrol -bin/smbpasswd -bin/smbspool -bin/smbstatus -bin/smbtar -bin/tdbbackup -bin/testparm -bin/testprns -%%WINBIND_AUTH_CHALLENGE%%bin/wbinfo -%%WINBIND_NSS%%lib/nss_winbind.so.1 -%%WINBIND%%sbin/winbindd -etc/codepages/codepage.1125 -etc/codepages/unicode_map.1125 -etc/codepages/unicode_map.KOI8-U -etc/codepages/codepage.1251 -etc/codepages/codepage.437 -etc/codepages/codepage.737 -etc/codepages/codepage.775 -etc/codepages/codepage.850 -etc/codepages/codepage.852 -etc/codepages/codepage.857 -etc/codepages/codepage.861 -etc/codepages/codepage.866 -etc/codepages/codepage.932 -etc/codepages/codepage.936 -etc/codepages/codepage.949 -etc/codepages/codepage.950 -etc/codepages/unicode_map.437 -etc/codepages/unicode_map.737 -etc/codepages/unicode_map.775 -etc/codepages/unicode_map.850 -etc/codepages/unicode_map.852 -etc/codepages/unicode_map.857 -etc/codepages/unicode_map.861 -etc/codepages/unicode_map.866 -etc/codepages/unicode_map.932 -etc/codepages/unicode_map.936 -etc/codepages/unicode_map.949 -etc/codepages/unicode_map.950 -etc/codepages/unicode_map.1251 -etc/codepages/unicode_map.ISO8859-1 -etc/codepages/unicode_map.ISO8859-13 -etc/codepages/unicode_map.ISO8859-15 -etc/codepages/unicode_map.ISO8859-2 -etc/codepages/unicode_map.ISO8859-5 -etc/codepages/unicode_map.ISO8859-7 -etc/codepages/unicode_map.ISO8859-9 -etc/codepages/unicode_map.KOI8-R -etc/rc.d/samba.sh.sample -%%RECYCLE%%etc/recycle.conf.default -etc/smb.conf.default -%%AUDIT%%lib/samba/audit.so -%%RECYCLE%%lib/samba/recycle.so -sbin/nmbd -sbin/smbd -sbin/swat -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/Manifest -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD -%%PORTDOCS%%%%DOCSDIR%%/README.swat -%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4-Locking.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4_PlainPassword.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/Win2000_PlainPassword.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/Win95_PlainPassword.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/Win98_PlainPassword.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/Win9X-CacheHandling.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/WinME_PlainPassword.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/WinXP_SignOrSeal.reg -%%PORTDOCS%%%%DOCSDIR%%/Registry/WindowsTerminalServer.reg -%%PORTDOCS%%%%DOCSDIR%%/Roadmap -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt -%%PORTDOCS%%%%DOCSDIR%%/announce -%%PORTDOCS%%%%DOCSDIR%%/faq/README -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-Server-FAQ-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-Server-FAQ-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-Server-FAQ.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-Server-FAQ.sgml -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-4.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-5.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ-6.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ.html -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ.sgml -%%PORTDOCS%%%%DOCSDIR%%/faq/Samba-meta-FAQ.txt -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq-4.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq-5.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq.sgml -%%PORTDOCS%%%%DOCSDIR%%/faq/sambafaq.txt -%%PORTDOCS%%%%DOCSDIR%%/history -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/CVS-Access.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/DOMAIN_MEMBER.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ENCRYPTION.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Integrating-with-Windows.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/NT_Security.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/OS2-Client-HOWTO.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/PAM-Authentication-And-Samba.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-BDC-HOWTO.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-HOWTO-Collection.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-LDAP-HOWTO.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-PDC-HOWTO.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/UNIX_INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/cups.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/findsmb.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/lmhosts.5.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/make_smbcodepage.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/make_unicodemap.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/msdfs_setup.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmbd.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmblookup.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pdbedit.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/printer_driver2.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/rpcclient.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba.7.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smb.conf.5.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcacls.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbclient.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcontrol.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbd.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmnt.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmount.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.5.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbsh.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbspool.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbstatus.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbtar.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbumount.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/swat.8.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testparm.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testprns.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/wbinfo.1.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/wfw_slip.htm -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbind.html -%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbindd.8.html -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Application_Serving.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/BROWSING-Config.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/BROWSING.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/CUPS-PrintingInfo.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/DHCP-Server-Configuration.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/DIAGNOSIS.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/DNIX.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Faxing.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/GOTCHAS.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/HINTS.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/INSTALL.sambatar -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Imprints.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Macintosh_Clients.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/NetBIOS.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/PROFILES.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Passwords.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Printing.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/README.DCEDFS -%%PORTDOCS%%%%DOCSDIR%%/textdocs/README.NOW -%%PORTDOCS%%%%DOCSDIR%%/textdocs/README.jis -%%PORTDOCS%%%%DOCSDIR%%/textdocs/README.sambatar -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Recent-FAQs.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/RoutedNetworks.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/SCO.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/SMBTAR.notes -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Samba-OpenSSL.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Speed.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Speed2.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Tracing.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/UNIX-SMB.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/UNIX_SECURITY.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/Win95.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/WinNT.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/cifsntdomain.txt -%%PORTDOCS%%%%DOCSDIR%%/textdocs/security_level.txt -%%EXAMPLESDIR%%/LDAP/README -%%EXAMPLESDIR%%/LDAP/export_smbpasswd.pl -%%EXAMPLESDIR%%/LDAP/import_smbpasswd.pl -%%EXAMPLESDIR%%/LDAP/ldapchpasswd -%%EXAMPLESDIR%%/LDAP/ldapsync.pl -%%EXAMPLESDIR%%/LDAP/samba-nds.schema -%%EXAMPLESDIR%%/LDAP/samba.schema -%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x -%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x -%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay -%%EXAMPLESDIR%%/LDAP/smbldap-tools/CONTRIBUTORS -%%EXAMPLESDIR%%/LDAP/smbldap-tools/COPYING -%%EXAMPLESDIR%%/LDAP/smbldap-tools/ChangeLog -%%EXAMPLESDIR%%/LDAP/smbldap-tools/FILES -%%EXAMPLESDIR%%/LDAP/smbldap-tools/INFRASTRUCTURE -%%EXAMPLESDIR%%/LDAP/smbldap-tools/INSTALL -%%EXAMPLESDIR%%/LDAP/smbldap-tools/Makefile -%%EXAMPLESDIR%%/LDAP/smbldap-tools/README -%%EXAMPLESDIR%%/LDAP/smbldap-tools/TODO -%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/README -%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/ldappass.cgi -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/Makefile -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.c -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.h -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/md4.c -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.c -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.h -%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/smbdes.c -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupadd.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupdel.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupmod.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupshow.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-accounts.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-groups.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-passwd.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-populate.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-tools.spec -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-useradd.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-userdel.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usermod.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm -%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm -%%EXAMPLESDIR%%/README -%%BUILD_VFS%%%%EXAMPLESDIR%%/VFS/Makefile -%%EXAMPLESDIR%%/VFS/README -%%EXAMPLESDIR%%/VFS/block/block.c -%%BUILD_VFS%%%%EXAMPLESDIR%%/VFS/block/block.o -%%BUILD_VFS%%%%EXAMPLESDIR%%/VFS/block/block.so -%%EXAMPLESDIR%%/VFS/block/samba-block.conf -%%EXAMPLESDIR%%/VFS/block/smb.conf -%%EXAMPLESDIR%%/VFS/recycle/README -%%EXAMPLESDIR%%/VFS/recycle/cleanup_recycle.pl -%%EXAMPLESDIR%%/VFS/recycle/recycle.c -%%EXAMPLESDIR%%/VFS/recycle/recycle.conf -%%EXAMPLESDIR%%/VFS/audit.c -%%EXAMPLESDIR%%/VFS/skel.c -%%EXAMPLESDIR%%/VFS/Makefile.in -%%EXAMPLESDIR%%/VFS/configure -%%EXAMPLESDIR%%/VFS/configure.in -%%EXAMPLESDIR%%/appliance/Makefile -%%EXAMPLESDIR%%/appliance/README -%%EXAMPLESDIR%%/appliance/appliance.spec -%%EXAMPLESDIR%%/appliance/build.sh -%%EXAMPLESDIR%%/appliance/smb.conf-appliance -%%EXAMPLESDIR%%/autofs/auto.a -%%EXAMPLESDIR%%/dce-dfs/README -%%EXAMPLESDIR%%/dce-dfs/smb.conf -%%EXAMPLESDIR%%/libsmbclient/testsmbc.c -%%EXAMPLESDIR%%/libsmbclient/tree.c -%%EXAMPLESDIR%%/misc/extra_smbstatus -%%EXAMPLESDIR%%/misc/modify_samba_config.pl -%%EXAMPLESDIR%%/misc/swat.pl -%%EXAMPLESDIR%%/misc/wall.perl -%%EXAMPLESDIR%%/printer-accounting/README -%%EXAMPLESDIR%%/printer-accounting/acct-all -%%EXAMPLESDIR%%/printer-accounting/acct-sum -%%EXAMPLESDIR%%/printer-accounting/hp5-redir -%%EXAMPLESDIR%%/printer-accounting/lp-acct -%%EXAMPLESDIR%%/printer-accounting/printcap -%%EXAMPLESDIR%%/printing/smbprint -%%EXAMPLESDIR%%/printing/smbprint.newer -%%EXAMPLESDIR%%/printing/smbprint.sysv -%%EXAMPLESDIR%%/printing/smbprint.old -%%EXAMPLESDIR%%/printing/smbprint.safer -%%EXAMPLESDIR%%/simple/README -%%EXAMPLESDIR%%/simple/smb.conf -%%EXAMPLESDIR%%/smb.conf.default -%%EXAMPLESDIR%%/svr4-startup/README -%%EXAMPLESDIR%%/svr4-startup/samba.server -%%EXAMPLESDIR%%/thoralf/smb.conf -%%EXAMPLESDIR%%/tridge/README -%%EXAMPLESDIR%%/tridge/smb.conf -%%EXAMPLESDIR%%/tridge/smb.conf.WinNT -%%EXAMPLESDIR%%/tridge/smb.conf.fjall -%%EXAMPLESDIR%%/tridge/smb.conf.lapland -%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk -%%EXAMPLESDIR%%/validchars/msdos70.out -%%EXAMPLESDIR%%/validchars/nwdos70.out -%%EXAMPLESDIR%%/validchars/readme -%%EXAMPLESDIR%%/validchars/validchr.c -%%EXAMPLESDIR%%/validchars/validchr.com -%%EXAMPLESDIR%%/libsmbclient/Makefile -%%EXAMPLESDIR%%/libsmbclient/README -share/swat/help/CVS-Access.html -share/swat/help/DOMAIN_MEMBER.html -share/swat/help/ENCRYPTION.html -share/swat/help/Integrating-with-Windows.html -share/swat/help/NT_Security.html -share/swat/help/OS2-Client-HOWTO.html -share/swat/help/PAM-Authentication-And-Samba.html -share/swat/help/Samba-BDC-HOWTO.html -share/swat/help/Samba-HOWTO-Collection.html -share/swat/help/Samba-LDAP-HOWTO.html -share/swat/help/Samba-PDC-HOWTO.html -share/swat/help/UNIX_INSTALL.html -share/swat/help/cups.html -share/swat/help/findsmb.1.html -share/swat/help/lmhosts.5.html -share/swat/help/make_smbcodepage.1.html -share/swat/help/make_unicodemap.1.html -share/swat/help/msdfs_setup.html -share/swat/help/nmbd.8.html -share/swat/help/nmblookup.1.html -share/swat/help/pdbedit.8.html -share/swat/help/printer_driver2.html -share/swat/help/rpcclient.1.html -share/swat/help/samba.7.html -share/swat/help/smb.conf.5.html -share/swat/help/smbcacls.1.html -share/swat/help/smbclient.1.html -share/swat/help/smbcontrol.1.html -share/swat/help/smbd.8.html -share/swat/help/smbmnt.8.html -share/swat/help/smbmount.8.html -share/swat/help/smbpasswd.5.html -share/swat/help/smbpasswd.8.html -share/swat/help/smbsh.1.html -share/swat/help/smbspool.8.html -share/swat/help/smbstatus.1.html -share/swat/help/smbtar.1.html -share/swat/help/smbumount.8.html -share/swat/help/swat.8.html -share/swat/help/testparm.1.html -share/swat/help/testprns.1.html -share/swat/help/wbinfo.1.html -share/swat/help/welcome.html -share/swat/help/winbind.html -share/swat/help/winbindd.8.html -share/swat/images/globals.gif -share/swat/images/home.gif -share/swat/images/passwd.gif -share/swat/images/printers.gif -share/swat/images/samba.gif -share/swat/images/shares.gif -share/swat/images/status.gif -share/swat/images/viewconfig.gif -share/swat/images/wizard.gif -share/swat/include/footer.html -share/swat/include/header.html -share/swat/using_samba/appa_01.html -share/swat/using_samba/appa_02.html -share/swat/using_samba/appa_03.html -share/swat/using_samba/appa_04.html -share/swat/using_samba/appa_05.html -share/swat/using_samba/appb_01.html -share/swat/using_samba/appb_02.html -share/swat/using_samba/appb_03.html -share/swat/using_samba/appc_01.html -share/swat/using_samba/appd_01.html -share/swat/using_samba/appe_01.html -share/swat/using_samba/appf_01.html -share/swat/using_samba/ch01_01.html -share/swat/using_samba/ch01_02.html -share/swat/using_samba/ch01_03.html -share/swat/using_samba/ch01_04.html -share/swat/using_samba/ch01_05.html -share/swat/using_samba/ch01_06.html -share/swat/using_samba/ch01_07.html -share/swat/using_samba/ch01_08.html -share/swat/using_samba/ch02_01.html -share/swat/using_samba/ch02_02.html -share/swat/using_samba/ch02_03.html -share/swat/using_samba/ch02_04.html -share/swat/using_samba/ch02_05.html -share/swat/using_samba/ch02_06.html -share/swat/using_samba/ch03_01.html -share/swat/using_samba/ch03_02.html -share/swat/using_samba/ch03_03.html -share/swat/using_samba/ch04_01.html -share/swat/using_samba/ch04_02.html -share/swat/using_samba/ch04_03.html -share/swat/using_samba/ch04_04.html -share/swat/using_samba/ch04_05.html -share/swat/using_samba/ch04_06.html -share/swat/using_samba/ch04_07.html -share/swat/using_samba/ch04_08.html -share/swat/using_samba/ch05_01.html -share/swat/using_samba/ch05_02.html -share/swat/using_samba/ch05_03.html -share/swat/using_samba/ch05_04.html -share/swat/using_samba/ch05_05.html -share/swat/using_samba/ch06_01.html -share/swat/using_samba/ch06_02.html -share/swat/using_samba/ch06_03.html -share/swat/using_samba/ch06_04.html -share/swat/using_samba/ch06_05.html -share/swat/using_samba/ch06_06.html -share/swat/using_samba/ch07_01.html -share/swat/using_samba/ch07_02.html -share/swat/using_samba/ch07_03.html -share/swat/using_samba/ch08_01.html -share/swat/using_samba/ch08_02.html -share/swat/using_samba/ch08_03.html -share/swat/using_samba/ch08_04.html -share/swat/using_samba/ch08_05.html -share/swat/using_samba/ch08_06.html -share/swat/using_samba/ch08_07.html -share/swat/using_samba/ch09_01.html -share/swat/using_samba/ch09_02.html -share/swat/using_samba/ch09_03.html -share/swat/using_samba/figs/sam.0101.gif -share/swat/using_samba/figs/sam.0102.gif -share/swat/using_samba/figs/sam.0103.gif -share/swat/using_samba/figs/sam.0104.gif -share/swat/using_samba/figs/sam.0105.gif -share/swat/using_samba/figs/sam.0106.gif -share/swat/using_samba/figs/sam.0107.gif -share/swat/using_samba/figs/sam.0108.gif -share/swat/using_samba/figs/sam.0109.gif -share/swat/using_samba/figs/sam.0110.gif -share/swat/using_samba/figs/sam.0111.gif -share/swat/using_samba/figs/sam.0112.gif -share/swat/using_samba/figs/sam.0113.gif -share/swat/using_samba/figs/sam.0114.gif -share/swat/using_samba/figs/sam.0201.gif -share/swat/using_samba/figs/sam.0202.gif -share/swat/using_samba/figs/sam.0203.gif -share/swat/using_samba/figs/sam.0204.gif -share/swat/using_samba/figs/sam.0301.gif -share/swat/using_samba/figs/sam.0302.gif -share/swat/using_samba/figs/sam.0303.gif -share/swat/using_samba/figs/sam.0304.gif -share/swat/using_samba/figs/sam.0305.gif -share/swat/using_samba/figs/sam.0306.gif -share/swat/using_samba/figs/sam.0307.gif -share/swat/using_samba/figs/sam.0308.gif -share/swat/using_samba/figs/sam.0309.gif -share/swat/using_samba/figs/sam.0310.gif -share/swat/using_samba/figs/sam.0311.gif -share/swat/using_samba/figs/sam.0312.gif -share/swat/using_samba/figs/sam.0313.gif -share/swat/using_samba/figs/sam.0314.gif -share/swat/using_samba/figs/sam.0315.gif -share/swat/using_samba/figs/sam.0316.gif -share/swat/using_samba/figs/sam.0317.gif -share/swat/using_samba/figs/sam.0318.gif -share/swat/using_samba/figs/sam.0319.gif -share/swat/using_samba/figs/sam.0320.gif -share/swat/using_samba/figs/sam.0321.gif -share/swat/using_samba/figs/sam.0322.gif -share/swat/using_samba/figs/sam.0323.gif -share/swat/using_samba/figs/sam.0324.gif -share/swat/using_samba/figs/sam.0325.gif -share/swat/using_samba/figs/sam.0326.gif -share/swat/using_samba/figs/sam.0327.gif -share/swat/using_samba/figs/sam.0328.gif -share/swat/using_samba/figs/sam.0401.gif -share/swat/using_samba/figs/sam.0402.gif -share/swat/using_samba/figs/sam.0403.gif -share/swat/using_samba/figs/sam.0404.gif -share/swat/using_samba/figs/sam.0405.gif -share/swat/using_samba/figs/sam.0406.gif -share/swat/using_samba/figs/sam.0407.gif -share/swat/using_samba/figs/sam.0501.gif -share/swat/using_samba/figs/sam.0502.gif -share/swat/using_samba/figs/sam.0503.gif -share/swat/using_samba/figs/sam.0504.gif -share/swat/using_samba/figs/sam.0505.gif -share/swat/using_samba/figs/sam.0506.gif -share/swat/using_samba/figs/sam.0507.gif -share/swat/using_samba/figs/sam.0508.gif -share/swat/using_samba/figs/sam.0601.gif -share/swat/using_samba/figs/sam.0602.gif -share/swat/using_samba/figs/sam.0603.gif -share/swat/using_samba/figs/sam.0604.gif -share/swat/using_samba/figs/sam.0605.gif -share/swat/using_samba/figs/sam.0606.gif -share/swat/using_samba/figs/sam.0701.gif -share/swat/using_samba/figs/sam.0702.gif -share/swat/using_samba/figs/sam.0703.gif -share/swat/using_samba/figs/sam.0704.gif -share/swat/using_samba/figs/sam.0705.gif -share/swat/using_samba/figs/sam.0706.gif -share/swat/using_samba/figs/sam.0707.gif -share/swat/using_samba/figs/sam.0708.gif -share/swat/using_samba/figs/sam.0709.gif -share/swat/using_samba/figs/sam.0801.gif -share/swat/using_samba/figs/sam.0802.gif -share/swat/using_samba/figs/sam.0803.gif -share/swat/using_samba/figs/sam.0804.gif -share/swat/using_samba/figs/sam.0805.gif -share/swat/using_samba/figs/sam.0901.gif -share/swat/using_samba/figs/sam.0902.gif -share/swat/using_samba/figs/sam.0903.gif -share/swat/using_samba/figs/sam.0904.gif -share/swat/using_samba/figs/sam.0905.gif -share/swat/using_samba/figs/sam.aa01.gif -share/swat/using_samba/figs/sam.ab01.gif -share/swat/using_samba/figs/sam.ab02.gif -share/swat/using_samba/gifs/index.gif -share/swat/using_samba/gifs/samba.s.gif -share/swat/using_samba/gifs/txthome.gif -share/swat/using_samba/gifs/txtnexta.gif -share/swat/using_samba/gifs/txtpreva.gif -share/swat/using_samba/index.html -share/swat/using_samba/inx.html -share/swat/using_samba/licenseinfo.html -share/swat/using_samba/this_edition.html -@dirrm share/swat/using_samba/gifs -@dirrm share/swat/using_samba/figs -@dirrm share/swat/using_samba -@dirrm share/swat/include -@dirrm share/swat/images -@dirrm share/swat/help -@dirrm share/swat -@dirrm %%EXAMPLESDIR%%/validchars -@dirrm %%EXAMPLESDIR%%/tridge -@dirrm %%EXAMPLESDIR%%/thoralf -@dirrm %%EXAMPLESDIR%%/svr4-startup -@dirrm %%EXAMPLESDIR%%/simple -@dirrm %%EXAMPLESDIR%%/printing -@dirrm %%EXAMPLESDIR%%/printer-accounting -@dirrm %%EXAMPLESDIR%%/misc -@dirrm %%EXAMPLESDIR%%/libsmbclient -@dirrm %%EXAMPLESDIR%%/dce-dfs -@dirrm %%EXAMPLESDIR%%/autofs -@dirrm %%EXAMPLESDIR%%/appliance -@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd -@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi -@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools -@dirrm %%EXAMPLESDIR%%/LDAP -@dirrm %%EXAMPLESDIR%%/VFS/block -@dirrm %%EXAMPLESDIR%%/VFS/recycle -@dirrm %%EXAMPLESDIR%%/VFS -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Registry -%%PORTDOCS%%@dirrm %%DOCSDIR%%/textdocs -%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/codepages -%%LIBSAMBA%%@dirrm lib/samba diff --git a/net/samba/scripts/configure.samba b/net/samba/scripts/configure.samba deleted file mode 100644 index 120baa4445a2..000000000000 --- a/net/samba/scripts/configure.samba +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${BATCH}" ]; then - if [ "${SAMBA_OPTIONS}" ]; then - set ${SAMBA_OPTIONS} - fi -else - /usr/bin/dialog --title "samba configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 12 \ -syslog "With syslog support" OFF \ -ssl "With ssl support" OFF \ -ldap "With LDAP2 support" OFF \ -nocups "Without CUPS" OFF \ -acl "With ACL support" OFF \ -utmp "With UTMP support" OFF \ -msdfs "With MSDFS support" OFF \ -quota "With Quota support" OFF \ -recycle "With Recycle Bin" OFF \ -audit "With Audit" OFF \ -winbind "With Winbind" OFF \ -wbauth "With Winbind Auth Challenge" OFF \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `cat $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${REALCURDIR} -echo "SCRIPT_RUN=yes" >${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - -while [ "$1" ]; do - case $1 in - \"syslog\") - echo "WITH_SYSLOG=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"ssl\") - echo "WITH_SSL=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"ldap\") - echo "WITH_LDAP=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"nocups\") - echo "WITHOUT_CUPS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"acl\") - echo "WITH_ACL_SUPPORT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"utmp\") - echo "WITH_UTMP=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"msdfs\") - echo "WITH_MSDFS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"quota\") - echo "WITH_QUOTAS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"recycle\") - echo "WITH_RECYCLE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"audit\") - echo "WITH_AUDIT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"winbind\") - echo "WITH_WINBIND=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - \"wbauth\") - echo "WITH_WINBIND_AUTH_CHALLENGE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - ;; - *) - echo "Invalid option: $1" - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done diff --git a/security/antivir-milter/Makefile b/security/antivir-milter/Makefile deleted file mode 100644 index b1020afa3fdc..000000000000 --- a/security/antivir-milter/Makefile +++ /dev/null @@ -1,131 +0,0 @@ -# New ports collection makefile for: antivir-milter -# Date created: 21 September 2003 -# Whom: marius@alchemy.franken.de -# -# $FreeBSD$ - -PORTNAME= antivir-milter -PORTVERSION= 1.1.2p1 -DISTVERSIONPREFIX= prof- -DISTVERSION= ${PORTVERSION:C/p/-/} -CATEGORIES= security mail -MASTER_SITES= http://dl.antivir.de/down/unix/packages/ - -MAINTAINER= marius@FreeBSD.org -COMMENT= AntiVir Milter mail virusscanner for Sendmail - -DEPRECATED= Free license keys are no longer available since September 2005 -EXPIRATION_DATE= 2006-08-31 - -RESTRICTED= H+BEDV Datentechnik GmbH forbids any redistribution -NO_PACKAGE= ${RESTRICTED} -NO_CDROM= ${RESTRICTED} - -ONLY_FOR_ARCHS= i386 -NO_BUILD= yes -# When the avmilter binary is stripped its self-check fails. -STRIP= -PKGMESSAGE= ${WRKDIR}/pkg-message - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 400000 -IGNORE= requires FreeBSD 4.0 or higher -.endif - -.if (!exists(/usr/lib/libmilter.a)) && (!exists(${LOCALBASE}/lib/libmilter.a)) -IGNORE= requires Sendmail 8.12 -.endif - -.if ${OSVERSION} >= 503001 -BINSRC= ${WRKSRC}/bin/freebsd5 -.if ${OSVERSION} > 600004 -LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x -.endif -.else -BINSRC= ${WRKSRC}/bin/freebsd -.endif - -post-extract: - @${CP} ${FILESDIR}/avq.sh ${WRKSRC}/script/avq - -post-patch: -.for i in doc/MANUAL doc/RELEASE_NOTES etc/antivir.conf etc/avmilter.conf \ - pgp/README script/avq script/avupdater script/rc.avmilter - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i} -.endfor - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > \ - ${WRKDIR}/pkg-message - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/antivirupdater.sh > \ - ${WRKDIR}/antivirupdater.sh - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/avqrm.sh > \ - ${WRKDIR}/avqrm.sh - -do-install: - @${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/AntiVir - @${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 ${BINSRC}/antivir \ - ${PREFIX}/AntiVir/antivir-dist_avmilter -.if !exists(${PREFIX}/AntiVir/antivir) - @${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 ${BINSRC}/antivir \ - ${PREFIX}/AntiVir -.endif -.for i in antivir0.vdf antivir1.vdf antivir2.vdf antivir3.vdf - @${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/${i} \ - ${PREFIX}/AntiVir/${i}-dist_avmilter -.if !exists(${PREFIX}/AntiVir/${i}) - @${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/${i} \ - ${PREFIX}/AntiVir -.endif -.endfor - @${INSTALL_SCRIPT} ${WRKSRC}/script/avq ${PREFIX}/bin - @${INSTALL} -d ${PREFIX}/etc/avmilter -.for i in avmilter.conf avmilter.ignore avmilter.scan avmilter.warn - @${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/etc/avmilter/${i}.sample -.if !exists(${PREFIX}/etc/avmilter/${i}) - @${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/etc/avmilter -.endif -.endfor - @${INSTALL_DATA} ${WRKSRC}/etc/antivir.conf \ - ${PREFIX}/etc/antivir.conf.sample -.if !exists(${PREFIX}/etc/antivir.conf) - @${INSTALL_DATA} ${WRKSRC}/etc/antivir.conf ${PREFIX}/etc -.endif - @${LN} -sf ${PREFIX}/etc/antivir.conf /etc - @${INSTALL_PROGRAM} ${BINSRC}/avmilter.bin ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKDIR}/antivirupdater.sh \ - ${PREFIX}/sbin/antivirupdater - @${INSTALL_SCRIPT} ${WRKDIR}/avqrm.sh ${PREFIX}/bin/avqrm - @${INSTALL_SCRIPT} ${WRKSRC}/script/avupdater \ - ${PREFIX}/etc/rc.d/avupdater.sh-dist_avmilter - @${INSTALL_SCRIPT} ${WRKSRC}/script/rc.avmilter \ - ${PREFIX}/etc/rc.d/avmilter.sh - @${INSTALL} -d -o smmsp -g smmsp -m 700 /var/spool/avmilter -.for i in incoming outgoing rejected - @${INSTALL} -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/${i} -.endfor - @${INSTALL} -d ${EXAMPLESDIR} -.for i in de en es hu it nl - @${INSTALL} -d ${EXAMPLESDIR}/templates/${i} -.for j in patho-administrator patho-recipient patho-sender virus-administrator \ - virus-recipient virus-sender - @${INSTALL_DATA} ${WRKSRC}/templates/${i}/${j} \ - ${EXAMPLESDIR}/templates/${i} -.endfor -.endfor -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} -.for i in LICENSE LICENSE.DE - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.for i in CHANGELOG MANUAL RELEASE_NOTES avmilter_de.pdf avmilter_en.pdf - @${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} -.endfor - @${INSTALL_DATA} ${WRKSRC}/pgp/README ${DOCSDIR}/README.gpg - @${INSTALL_DATA} ${WRKSRC}/pgp/antivir.gpg ${DOCSDIR} -.endif - -post-install: - @${CAT} ${WRKDIR}/pkg-message - -.include <bsd.port.post.mk> diff --git a/security/antivir-milter/distinfo b/security/antivir-milter/distinfo deleted file mode 100644 index af9aafbae47f..000000000000 --- a/security/antivir-milter/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (antivir-milter-prof-1.1.2-1.tar.gz) = e5fd31d676717ea1e2420cb402c53f7f -SHA256 (antivir-milter-prof-1.1.2-1.tar.gz) = 543f268f66dbf06ffdf823ed8f4b8c5e162855ad5fac454ba394d47b19e999e5 -SIZE (antivir-milter-prof-1.1.2-1.tar.gz) = 12693370 diff --git a/security/antivir-milter/files/antivirupdater.sh b/security/antivir-milter/files/antivirupdater.sh deleted file mode 100644 index 6f309d9162b8..000000000000 --- a/security/antivir-milter/files/antivirupdater.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec %%PREFIX%%/AntiVir/antivir -C %%PREFIX%%/etc/antivir.conf --home-dir=%%PREFIX%%/AntiVir --update $1 diff --git a/security/antivir-milter/files/avq.sh b/security/antivir-milter/files/avq.sh deleted file mode 100644 index ed88e9fe5ed0..000000000000 --- a/security/antivir-milter/files/avq.sh +++ /dev/null @@ -1,336 +0,0 @@ -#!/bin/sh -#****************************************************************************** -#DESCRIPTION -# -# Queue displayer/manager for AntiVir Milter. -# -#VERSION 1.2 -# -#USAGE -# avq [--conf=.conf] " -# avq [--queue=DIR] " -# avq [--remove=ID]... " -# avq [--deliver=ID|--reprocess=ID]... " -# avq [--delivery|--check|--enqueue=CTRL-FILE]... " -# -# "--deliver= and --delivery make the message go to the Q state." -# "--reprocess= and --check make the message go to the q state." -# "--deliver= and --reprocess= work on messages already in the queue." -# "--delivery and --check apply to messages being enqueued." -# "ID is like '32557-0BE692EB'." -# "CTRL-FILE is like '/path/to/a/queue/?f-32557-0BE692EB'." -# -#LEGAL -# Copyright (c) 2001 - 2004 H+BEDV Datentechnik GmbH -# -# This script is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This script 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 -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this library; see the file COPYING.LIB. -# If not, write to the Free Software Foundation, -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#****************************************************************************** - -configuration=/etc/avmilter.conf - -for arg ; -do - case ${arg} in - --conf=*) - configuration=`echo "${arg}" | sed -e 's/--conf=//'` - ;; - esac -done - -if [ ! -e ${configuration} ] -then - echo "The configuration file (${configuration}) does not exist" - echo "Please re-run the script" - echo "with the option --conf=/path/to/.conf" - exit -fi - -queue="`egrep -i '^[Ss][Pp][Oo][Oo][Ll][Dd][Ii][Rr]' ${configuration} | awk '{print $2;}'`" -queue_set=0 -pname="`basename $0`" -pblan="`echo ${pname} | sed -e 's/./ /g'`" -newstate=q -ctrl= -data= -systeme="`uname`" -date_param="-d" - -usage() { - echo "${pname} usage:" - echo " ${pname} [--conf=.conf] " - echo " ${pname} [--queue=DIR] " - echo " ${pblan} [--remove=ID]... " - echo " ${pblan} [--deliver=ID|--reprocess=ID]... " - echo " ${pblan} [--delivery|--check|--enqueue=CTRL-FILE]... " - echo "" - echo "--deliver= and --delivery make the message go to the Q state." - echo "--reprocess= and --check make the message go to the q state." - echo "--deliver= and --reprocess= work on messages already in the queue." - echo "--delivery and --check apply to messages being enqueued." - echo "ID is like '32557-0BE692EB'." - echo "CTRL-FILE is like '/path/to/a/queue/?f-32557-0BE692EB'." -} - - -# df- data file. -# xf- ctrl file transient. -# qf- ctrl file queued for virus check. -# Qf- ctrl file queued for direct delivery. -# vf- ctrl file virus detected. -# mf- ctrl file mime problem detected (pathological email). - - -if [ -z ${queue} ] ; then - queue="/var/spool/avmilter" -fi - -case "$systeme" in - -FreeBSD) - date_param="-r" - ;; -esac - -for arg ; do - case "$arg" in - --conf=*) - ;; - - --queue=*) - if [ $queue_set -ne 0 ] ; then - echo "${pname}: queue already set to '${queue}'." - exit 2 - fi - queue_set=1 - queue=`echo "$arg"|sed -e 's/--queue=//'` - if [ ! -d "$queue" ] ; then - echo "${pname}: there is no directory named '$queue'." - exit 2 - fi - ;; - - --deliver=*|--reprocess=*|--remove=*|--hold=*) - case "$arg" in - --reprocess=*) - id=`echo "$arg"|sed -e 's/--reprocess=//'` - newstate=q - action=reprocessing - ;; - --deliver=*) - id=`echo "$arg"|sed -e 's/--deliver=//'` - newstate=Q - action=delivery - ;; - --remove=*) - id=`echo "$arg"|sed -e 's/--remove=//'` - newstate=R - action=removing - ;; - --hold=*) - id=`echo "$arg"|sed -e 's/--hold=//'` - newstate=H - action=holding - ;; - esac - ctrl=`/bin/ls "${queue}"/*/[HQqvmx]f-"${id}"` - data=`/bin/ls "${queue}"/*/[Dd]f-"${id}"` - echo "ctor: ${ctrl} ${data}" - if [ ! -f "${data}" ] ; then - echo "${pname}: there is no data file id '${id}'"\ - "in queue '$queue'." - exit 3 - fi - if [ ! -f "${ctrl}" ] ; then - echo "${pname}: there is no control file id '${id}'"\ - "in queue '$queue'." - exit 3 - fi - bnam="`basename ${ctrl}`" - case $newstate in - R) - ( /bin/rm "${ctrl}" && /bin/rm "${data}" ) \ - && echo "${pname}: message id '${id}' removed." \ - || echo "${pname}: could not remove message id '${id}'." - ;; - *) - Qtrl="`echo $bnam|sed -e 's/^.\(.*\)$/'${newstate}'\1/'`" - - nctrl="${queue}/incoming/${Qtrl}" - ndata="${queue}/incoming/`basename ${data}`" - - if [ "${ctrl}" = "${nctrl}" ] ; then - echo "${pname}: ${action} of message"\ - "id '${id}' already forced." - else - [ "${data}" = "${ndata}" ] || mv "${data}" "${ndata}" - mv "${ctrl}" "${nctrl}" \ - && echo "${pname}: ${action} of message id"\ - "'${id}' will be forced."\ - || echo "${pname}: failed forcing ${action}"\ - "of message id '${id}'." - fi - ;; - esac - ;; - - --delivery) - newstate=Q - ;; - --check) - newstate=q - ;; - --enqueue=*) - ctrl=`echo "$arg"|sed -e 's/--enqueue=//'` - if [ -f "${ctrl}" ] ; then - ddir="`dirname $ctrl`" - bnam="`basename $ctrl`" - data="$ddir/`echo $bnam|sed -e 's/.\(.*\)/d\1/'`" - nnam="`echo $bnam|sed -e 's/^.\(.*\)$/'${newstate}'\1/'`" - id="`echo $bnam|sed -e 's/^..-\(.*\)$/\1/'`" - user=`egrep -i '^user' "$configuration"|awk '{print $2;}'` - group=`egrep -i '^group' "$configuration"|awk '{print $2;}'` - if [ -f "${data}" ] ; then - if /bin/ls "${queue}"/*/??-"${id}" > /dev/null 2>&1 ; then - echo "${pname}: there is already files with id '${id}'" - echo "${pblan} in queue '${queue}'." - exit 3 - else - cp "${data}" "${queue}/incoming/" \ - && cp "${ctrl}" "${queue}/incoming/${nnam}" \ - && chown ${user}.${group} "${queue}/incoming/"??"-${id}" \ - && echo "${pname} enqueued '${nnam}'." - fi - else - echo "${pname}: there is no data file named '${data}'." - exit 3 - fi - else - echo "${pname}: there is no control file named '${ctrl}'." - exit 3 - fi - ;; - - -h|--help) - usage - exit 0 - ;; - -*) - echo "${pname}: unknown option '${arg}'." - usage - exit 1 - ;; - *) - echo "${pname}: superfluous argument '${arg}'." - usage - exit 1 - ;; - esac -done - -if [ -z ${queue} ] ; then - queue="/var/spool/avmilter" -fi - -cd "${queue}" -qsize=` ( ( cd incoming ; /bin/ls -1 ) ; ( cd rejected ; /bin/ls -1 ) ; ( cd outgoing ; /bin/ls -1 ) ) | /usr/bin/wc -l` - -if [ $qsize -eq 0 ] ; then - echo "AntiVir Milter mail queue is empty." - exit 0 -fi -printf "\n%c %14s %8s %19s %s\n" \ - S "---Queue ID---" "--Size--" \ - "----Arrival Time---" "---Sender/Recipients-------" - - find . -type f -mindepth 2 -maxdepth 2 -iname "??-*-*" | cut -d / -f 2- | xargs ls -l \ - | awk '{ if(($9!="")&&($9!="./")&&($9!="../")){print $9 " " $5} }' \ - | awk ' -BEGIN{ - nid=0; -} -{ - dir_file=$1; - size=$2; - - - dir=substr(dir_file,1,9); - if((dir=="incoming/")||(dir=="rejected/")||(dir=="outgoing/")){ - file=substr(dir_file,10,length(dir_file)); - }else{ - file=dir_file; - } - state=substr(file,1,1); - id=substr(file,4,length(file)); - - if(!id_exist(id)){ - ids[nid++]=id; - } - if(state=="d"){ - sizes[id]=size; - }else{ - states[id]=state; - } - whereis[id]=dir; -} - -function id_exist(id){ - for(i=0;i<nid;i++){ - if(ids[i]==id){ - return(1); - } - } - return(0); -} - -END{ - for(i=0;i<nid;i++){ - id=ids[i]; - state=states[id]; - if(state==""){ - state="E"; - } - size=sizes[id]; - where=whereis[id]; - printf "%c %16s %10d %s\n",state,id,size,where; - } -} -' \ -| sort -t- +0.0 -0.1 +0.2n +1 \ -| while read state id size where; do - - from=`grep -s FROM "${queue}/${where}${state}f-${id}"|awk '{print $2}'` - ctim=`grep -s CTIM "${queue}/${where}${state}f-${id}"|awk '{print $2}'` - rcpt=`grep -s RCPT "${queue}/${where}${state}f-${id}"|awk '{printf "%46s%s\n","",$2;}'` - stat=`grep -s STAT "${queue}/${where}${state}f-${id}"\ - |awk 'BEGIN{s="Not processed yet.";r="";}\ - {if($2==2){s="MIME problem.";}else if($2==3){s="Found";}else - if($2==1){s="OK.";}r=substr($0,8);}END{printf "%-14s%s",s,r;}'` -case "$systeme" in -FreeBSD | OpenBSD) - mailtime=`date $date_param "$ctim" +"%Y-%m-%d %T"` - ;; -*) - mailtime=`date $date_param "1970-01-01 $ctim sec" +"%Y-%m-%d %T"` - ;; -esac -# mailtime=`date $date_param "1970-01-01 $ctim sec" +"%Y-%m-%d %T"` - printf "%c %14s %8d %s %s\n%s\n --> %s\n\n" \ - "$state" "$id" "$size" "$mailtime" "$from" "$rcpt" "$stat" -done - -exit 0 -#END - diff --git a/security/antivir-milter/files/avqrm.sh b/security/antivir-milter/files/avqrm.sh deleted file mode 100644 index 41419fea63a4..000000000000 --- a/security/antivir-milter/files/avqrm.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec %%PREFIX%%/bin/avq --remove=$1 diff --git a/security/antivir-milter/files/patch-doc::MANUAL b/security/antivir-milter/files/patch-doc::MANUAL deleted file mode 100644 index 9164c03c168b..000000000000 --- a/security/antivir-milter/files/patch-doc::MANUAL +++ /dev/null @@ -1,135 +0,0 @@ ---- doc/MANUAL.orig Wed Jan 28 11:48:04 2004 -+++ doc/MANUAL Mon Mar 1 01:08:06 2004 -@@ -40,37 +40,38 @@ - - To start, stop, restart AntiVir Milter: - -- # /usr/sbin/rcavmilter [start|stop|status|restart] -+ # %%PREFIX%%/etc/rc.d/avmilter.sh [start|stop|status|restart] - - When executed successfully, a message from AntiVir Milter with - the scan engine version and VDF version is present in the log file --/var/log/mail, /var/log/maillog or /var/log/mail.log -+/var/log/maillog - - - 2. Copying the license file - --------------------------- - --Copy the license file *.key to the folder /usr/lib/AntiVir and --set the access rights of user and group to default root:antivir : -+Copy the license file *.key to the folder %%PREFIX%%/AntiVir and -+set the access rights of user and group to default root:smmsp: - -- # cp hbedv.key /usr/lib/AntiVir/ -- # chown root:antivir /usr/lib/AntiVir/hbedv.key -+ # cp hbedv.key %%PREFIX%%/AntiVir/ -+ # chown root:smmsp %%PREFIX%%/AntiVir/hbedv.key -+ # chmod 440 %%PREFIX%%/AntiVir/hbedv.key - - - 3. Configuring AntiVir Milter - ----------------------------- - --AntiVir Milter provides the configuration file /etc/avmilter.conf: --The following directives are available: -+AntiVir Milter provides the following directives in the configuration file -+%%PREFIX%%/etc/avmilter/avmilter.conf: - --# User uucp --# Group antivir -+# User smmsp -+# Group smmsp - # Postmaster postmaster - # MyHostName localhost - # SpoolDir /var/spool/avmilter --# AntiVirDir /usr/lib/AntiVir -+# AntiVirDir %%PREFIX%%/AntiVir - # TemporaryDir /var/tmp --# ForwardTo /usr/lib/sendmail -oem -oi -+# ForwardTo /usr/sbin/sendmail -oem -oi - # MaxNestingLevel same as ArchiveMaxRecursion - # MaxAttachments 100 - # BlockSuspiciousMime NO -@@ -78,7 +79,7 @@ - # ExposeRecipientAlerts NO - # ExposeSenderAlerts NO - # ExposePostmasterAlerts YES --# AlertsUser AntiVir -+# AlertsUser MAILER-DAEMON - # RejectAlertMail NO - # QuarantineAlert YES - # ScanInArchive YES -@@ -118,13 +119,13 @@ - ------------------------------- - - Add the following line for a daily update at e.g. 0:25 a.m.: --25 0 * * * root /usr/lib/AntiVir/antivir --update -q -+25 0 * * * root %%PREFIX%%/sbin/antivirupdater -q - - When using a proxy server, enter name server name and connection - in the file antivir.conf. - --The file /etc/antivir.conf contains settable parameters effecting --the automatic protection updates. The following directives -+The file %%PREFIX%%/etc/antivir.conf contains settable parameters -+effecting the automatic protection updates. The following directives - are provided: - - # EmailTo root@localhost -@@ -138,7 +139,7 @@ - # HTTPProxyPassword password - # SyslogFacility user - # SyslogPriority notice --# GnuPGBinary -+# GnuPGBinary %%LOCALBASE%%/bin/gpg - # GnuPGOptions - # DetectDialer - # DetectJoke -@@ -158,7 +159,7 @@ - you have the possibility to define your own text in alert and - pathological notification mails. - --The directory /usr/lib/AntiVir/templates contains the -+The directory %%PREFIX%%/AntiVir/templates contains the - following files: - - patho-administrator -@@ -216,14 +217,15 @@ - will be printed to syslog: - (avmilter[1234]: Mail from foo@bar.tld to john@doe.tld will be scanned!) - --The tables are: /etc/avmilter.scan and /etc/avmilter.ignore. -+The tables are: %%PREFIX%%/etc/avmilter/avmilter.scan and -+%%PREFIX%%/etc/avmilter/avmilter.ignore. - Example files are included in this package. - Each table consists of an address that contains regular expressions - and one and/or two flags: - - Examples: - ---------------------- --/etc/avmilter.scan: -+avmilter.scan: - The i is an option for the regexp and it means ignore case. - - #The following matches exactly the *recipient* address "foo@bar.tld" -@@ -328,8 +330,8 @@ - no notice mail will be sent to the recipient(s) and the sender! - This behaviour cannot be changed. - --In the /etc/avmilter.warn file one can specify who receives a --mail in case of an alert. -+In the %%PREFIX%%/etc/avmilter/avmilter.warn file one can specify -+who receives a mail in case of an alert. - The definition there is used instead of the definition in the - avmilter.conf (Expose*Alerts). - -@@ -464,7 +466,7 @@ - mail. If set to a full path with filename, the text in that file will be - added to the mail. - --AddStatusInBody /usr/lib/AntiVir/templates/my_banner -+AddStatusInBody %%PREFIX%%/AntiVir/templates/my_banner - or - AddStatusInBody yes - diff --git a/security/antivir-milter/files/patch-doc::RELEASE_NOTES b/security/antivir-milter/files/patch-doc::RELEASE_NOTES deleted file mode 100644 index 4567d9774145..000000000000 --- a/security/antivir-milter/files/patch-doc::RELEASE_NOTES +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/RELEASE_NOTES.orig Fri Dec 2 15:49:46 2005 -+++ doc/RELEASE_NOTES Sat Dec 17 13:40:42 2005 -@@ -14,7 +14,7 @@ - updates or will even fetch an archive with the new software to your - local disk for your convenience. The newly introduced "UpdateStoreDir" - config item allows you to specify where the software archives should -- be stored, by default the directory "/usr/lib/AntiVir/updcomp/" is -+ be stored, by default the directory "%%PREFIX%%/AntiVir/updcomp/" is - used. Available updates for the "webgate" component will not be - applied automatically to your local installation. - diff --git a/security/antivir-milter/files/patch-etc::antivir.conf b/security/antivir-milter/files/patch-etc::antivir.conf deleted file mode 100644 index 5493c249040b..000000000000 --- a/security/antivir-milter/files/patch-etc::antivir.conf +++ /dev/null @@ -1,26 +0,0 @@ ---- etc/antivir.conf.orig Mon Dec 8 17:09:11 2003 -+++ etc/antivir.conf Mon Dec 8 17:11:16 2003 -@@ -52,7 +52,7 @@ - # advantage of GnuPG, be aware that all updates will fail - # until the AntiVir public key (antivir.gpg) has been - # added to your keyring and signed. --#GnuPGBinary /usr/local/bin/gpg -+#GnuPGBinary %%LOCALBASE%%/bin/gpg - - # If you are utilizing GnuPG, you may also specify - # options that your particular setup might need. -@@ -61,6 +61,7 @@ - - # These settings allow for the detection of certain categories - # of software which are not viruses but might not be wanted. -+# These options are only available in commercial mode. - #DetectDialer - #DetectJoke - #DetectGame -@@ -90,5 +91,5 @@ - - # AntiVir is capable of scanning the contents of sapcar archives. - # This requires the SAPCAR program from SAP. --#SapCarProgram /usr/local/bin/SAPCAR -+#SapCarProgram %%LOCALBASE%%/bin/SAPCAR - diff --git a/security/antivir-milter/files/patch-etc::avmilter.conf b/security/antivir-milter/files/patch-etc::avmilter.conf deleted file mode 100644 index aab271ccd61d..000000000000 --- a/security/antivir-milter/files/patch-etc::avmilter.conf +++ /dev/null @@ -1,96 +0,0 @@ ---- etc/avmilter.conf.orig Sun Sep 21 19:07:51 2003 -+++ etc/avmilter.conf Sun Sep 21 19:25:13 2003 -@@ -12,8 +12,8 @@ - # ------------------------------------------------------------------------ - # AntiVir Milter will run as the specified user and group. - --# User uucp --# Group antivir -+User smmsp -+Group smmsp - - - # ------------------------------------------------------------------------ -@@ -42,7 +42,7 @@ - # AntiVirDir: The antivir 'library' directory, where the VDF, - # the key, and some other files are stored. - --# AntiVirDir /usr/lib/AntiVir -+AntiVirDir %%PREFIX%%/AntiVir - - - # ------------------------------------------------------------------------ -@@ -65,7 +65,7 @@ - # Select the directory and binary of sendmail and the arguments how to - # call sendmail. - --# ForwardTo /usr/lib/sendmail -oem -oi -+ForwardTo /usr/sbin/sendmail -oem -oi - - - # ------------------------------------------------------------------------ -@@ -85,7 +85,7 @@ - # Block mails which are coded as a fragmented message. - # "Message Fragmentation and Reassembly" (RFC2046, section 5.2.2.1). - --# BlockFragmentedMessage NO -+# BlockFragmentedMessage NO - - - # ------------------------------------------------------------------------ -@@ -113,6 +113,7 @@ - # AlertsUser AvMilter - # or - # AlertsUser someone@anywhere.tld -+AlertsUser MAILER-DAEMON - - - # ------------------------------------------------------------------------ -@@ -183,7 +184,7 @@ - # If BlockSuspiciousArchive is YES, stop delivery of mails - # containing archives if ArchiveMaxRecursion has been reached. - --# BlockSuspiciousArchive NO -+# BlockSuspiciousArchive NO - - - # ------------------------------------------------------------------------ -@@ -193,7 +194,7 @@ - # If BlockEncryptedArchive is YES, stop delivery of mails - # containing encrypted files in an archive. - --# BlockEncryptedArchive NO -+# BlockEncryptedArchive NO - - - # ------------------------------------------------------------------------ -@@ -201,7 +202,7 @@ - # to the header of checked mail. E.g.: "X-AntiVirus: Checked by ..." - # This option is only available in commercial mode. - --# AddXHeader YES -+# AddXHeader YES - - - # ------------------------------------------------------------------------ -@@ -216,7 +217,7 @@ - # ScanTimeout specifies the scan time of mail, in seconds, when to stop - # scanning of mails. - --# ScanTimeout 300 -+# ScanTimeout 300 - - - # ------------------------------------------------------------------------ -@@ -224,6 +225,11 @@ - # rejected message. - - # ExternalProgram /dir/my_own_script -+ -+# Alternatively, uncomment the following line to automatically delete the -+# rejected message in the quarantine directory. -+ -+# ExternalProgram %%PREFIX%%/bin/avqrm - - - # ------------------------------------------------------------------------ diff --git a/security/antivir-milter/files/patch-pgp::README b/security/antivir-milter/files/patch-pgp::README deleted file mode 100644 index 8922c938286d..000000000000 --- a/security/antivir-milter/files/patch-pgp::README +++ /dev/null @@ -1,16 +0,0 @@ ---- pgp/README.orig Fri Oct 1 11:25:22 2004 -+++ pgp/README Tue Oct 12 17:50:07 2004 -@@ -58,10 +58,10 @@ - - - 7. Activate GnuPG in AntiVir by adding the GnuPGBinary directive to the -- /etc/antivir.conf file. This directive takes as argument the full path -- to your GnuPG binary. Typically it would look like this: -+ %%PREFIX%%/etc/antivir.conf file. This directive takes as argument the -+ full path to your GnuPG binary. Typically it would look like this: - -- GnuPGBinary /usr/local/bin/gpg -+ GnuPGBinary %%LOCALBASE%%/bin/gpg - - - Note: Currently only engine or program updates utilize GnuPG. VDF file diff --git a/security/antivir-milter/files/patch-script::avq b/security/antivir-milter/files/patch-script::avq deleted file mode 100644 index cc77b108e70c..000000000000 --- a/security/antivir-milter/files/patch-script::avq +++ /dev/null @@ -1,62 +0,0 @@ ---- script/avq.orig Sat Oct 11 13:26:02 2003 -+++ script/avq Sat Oct 11 13:31:54 2003 -@@ -39,7 +39,7 @@ - # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #****************************************************************************** - --configuration=/etc/avmilter.conf -+configuration=%%PREFIX%%/etc/avmilter/avmilter.conf - - for arg ; - do -@@ -68,6 +68,15 @@ - systeme="`uname`" - date_param="-d" - -+# Make sure the user running this program is root or the avmilter user. -+procowner=${procowner:-`/usr/bin/id -u`} -+user="`egrep -i '^user' $configuration | awk '{print $2;}'`" -+uid="`/usr/bin/id -u "$user"`" -+if [ "$procowner" != "0" -a "$procowner" != "$uid" ]; then -+ echo "${pname}: you must be root (uid 0) or the avmilter user to run this utility." -+ exit 2 -+fi -+ - usage() { - echo "${pname} usage:" - echo " ${pname} [--conf=.conf] " -@@ -149,7 +158,7 @@ - data=`/bin/ls "${queue}"/*/[Dd]f-"${id}"` - echo "ctor: ${ctrl} ${data}" - if [ ! -f "${data}" ] ; then -- echo "${pname}: there is no data file id '${id}'"\ -+ echo "${pname}: there is no data file id '${id}'"\ - "in queue '$queue'." - exit 3 - fi -@@ -161,9 +170,13 @@ - bnam="`basename ${ctrl}`" - case $newstate in - R) -- ( /bin/rm "${ctrl}" && /bin/rm "${data}" ) \ -- && echo "${pname}: message id '${id}' removed." \ -- || echo "${pname}: could not remove message id '${id}'." -+ if ( /bin/rm "${ctrl}" && /bin/rm "${data}" ) > /dev/null 2>&1 ; then -+ echo "${pname}: message id '${id}' removed." -+ exit 0 -+ else -+ echo "${pname}: could not remove message id '${id}'." -+ exit 3 -+ fi - ;; - *) - Qtrl="`echo $bnam|sed -e 's/^.\(.*\)$/'${newstate}'\1/'`" -@@ -204,7 +217,7 @@ - group=`egrep -i '^group' "$configuration"|awk '{print $2;}'` - if [ -f "${data}" ] ; then - if /bin/ls "${queue}"/*/??-"${id}" > /dev/null 2>&1 ; then -- echo "${pname}: there is already files with id '${id}'" -+ echo "${pname}: there are already files with id '${id}'" - echo "${pblan} in queue '${queue}'." - exit 3 - else diff --git a/security/antivir-milter/files/patch-script::avupdater b/security/antivir-milter/files/patch-script::avupdater deleted file mode 100644 index ba303ab79b86..000000000000 --- a/security/antivir-milter/files/patch-script::avupdater +++ /dev/null @@ -1,123 +0,0 @@ ---- script/avupdater.orig Nov 25 10:29:31 2004 -+++ script/avupdater Wed Dec 8 15:23:09 2004 -@@ -5,13 +5,11 @@ - # Copyright 2002-2005 H+BEDV Datentechnik GmbH - # - --PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" -- - DAEMONNAME="antivir" --AVDIR="/usr/lib/AntiVir" -+AVDIR="%%PREFIX%%/AntiVir" - - DAEMON="${AVDIR}/${DAEMONNAME}" --DAEMONPARAMS="--updater-daemon" -+DAEMONPARAMS="--updater-daemon -q -C %%PREFIX%%/etc/antivir.conf" - SERVICENAME="avupdater" - OS=`uname | tr "[:upper:]" "[:lower:]"` - PROCCMD="" -@@ -35,23 +33,22 @@ - { - if [ $1 -eq 0 ] - then -- ${ECHO} "." -+ ${ECHO} -n " ${SERVICENAME}" - fi - exit $1 - } - - stopEXIT() - { -- if [ $1 -ne 1 ] -+ if [ $1 -eq 0 ] - then -- ${ECHO} "." -+ ${ECHO} -n " ${SERVICENAME}" - fi - exit $1 - } - - statusEXIT() - { -- ${ECHO} "." - exit $1 - } - -@@ -104,7 +101,7 @@ - fi - fi - -- for PROC in `$PROCCMD | grep ${DAEMONNAME}.*${DAEMONPARAMS} | grep -v grep` -+ for PROC in `$PROCCMD | grep "${DAEMONNAME}.*${DAEMONPARAMS}" | grep -v grep` - do - if [ -z "`$ECHO ${PROC} | sed -e s/[0-9]//g`" ] - then -@@ -115,16 +112,9 @@ - - case "$1" in - start) -- ${ECHO} -n "Starting AntiVir: ${SERVICENAME}" -- - if [ ! -x "${DAEMON}" ] - then - # daemon missing -- -- ${ECHO} " (FAILED)" -- ${ECHO} " " -- ${ECHO} "error: ${DAEMON} missing" -- ${ECHO} " " - startEXIT 5 - fi - -@@ -144,20 +134,12 @@ - if [ ${ERROR} -ne 0 -o -z "${PROCESSLIST}" ] - then - # daemon failed to start, there is a problem -- -- ${ECHO} " (FAILED)" -- ${ECHO} " " -- ${ECHO} "error: ${DAEMON} failed" -- ${ECHO} "See log files for details." -- ${ECHO} " " - startEXIT 1 - fi - - startEXIT 0 - ;; - stop) -- ${ECHO} -n "Stopping AntiVir: ${SERVICENAME}" -- - getPROCESSLIST - if [ -z "${PROCESSLIST}" ] - then -@@ -194,28 +176,21 @@ - if [ ! -z "${PROCESSLIST}" ] - then - # there are still processes running? this may be a problem -- -- ${ECHO} " (FAILED)" -- ${ECHO} " " -- ${ECHO} "There may be processes still running." -- ${ECHO} " " - stopEXIT 1 - fi - - stopEXIT 0 - ;; - status) -- ${ECHO} -n "AntiVir Status: ${SERVICENAME} " -- - getPROCESSLIST - - # display the results of what we found - if [ -z "${PROCESSLIST}" ] - then -- ${ECHO} -n "not running" -+ ${ECHO} "FAILED ${SERVICENAME} not running" - statusEXIT 3 - else -- ${ECHO} -n "running" -+ ${ECHO} "OK ${SERVICENAME} running" - statusEXIT 0 - fi - ;; diff --git a/security/antivir-milter/files/patch-script::rc.avmilter b/security/antivir-milter/files/patch-script::rc.avmilter deleted file mode 100644 index a01c1ce0b99d..000000000000 --- a/security/antivir-milter/files/patch-script::rc.avmilter +++ /dev/null @@ -1,45 +0,0 @@ ---- script/rc.avmilter.orig Sun Sep 21 19:51:22 2003 -+++ script/rc.avmilter Sun Sep 21 20:22:38 2003 -@@ -13,13 +13,19 @@ - - case "$1" in - start) -- echo "Starting AntiVir Milter." -- /usr/lib/AntiVir/avmilter.bin -+ if [ -x %%PREFIX%%/sbin/avmilter.bin ]; then -+ umask 0077 -+ /bin/rm -f /var/spool/avmilter/avmilter.sock -+ /usr/sbin/daemon -f %%PREFIX%%/sbin/avmilter.bin \ -+ -P %%PREFIX%%/etc/avmilter \ -+ -p local:/var/spool/avmilter/avmilter.sock & -+ umask 0022 -+ echo -n " avmilter" -+ fi - ;; - stop) -- echo -n "Shutting down AntiVir Milter." -- killall -TERM /usr/lib/AntiVir/avmilter.bin > /dev/null 2>&1 -- echo -+ killall -TERM avmilter.bin > /dev/null 2>&1 -+ echo -n " avmilter" - ;; - restart) - "$0" stop -@@ -27,7 +33,7 @@ - "$0" start - ;; - status) -- if [ -z "$(ps axw | grep "/usr/lib/AntiVir/avmilter.bin" | grep -v grep)" ] -+ if [ -z "$(ps axw | grep "avmilter.bin" | grep -v grep)" ] - then - echo "FAILED avmilter is not running!" - else -@@ -35,7 +41,7 @@ - fi - ;; - *) -- echo "Usage: $0 {start|stop|restart|status}" -+ echo "Usage: `basename $0` {start|stop|restart|status}" >&2 - exit 1 - ;; - esac diff --git a/security/antivir-milter/pkg-descr b/security/antivir-milter/pkg-descr deleted file mode 100644 index c817dcee204b..000000000000 --- a/security/antivir-milter/pkg-descr +++ /dev/null @@ -1,25 +0,0 @@ -AntiVir Milter is a plug-in for sendmail versions 8.11 and up and communicates -via the libmilter interface of sendmail. -AntiVir Milter checks all incoming and outgoing emails. Infected emails are -blocked, depending on the presetting. A status message is written to "syslog". -The sender, receiver and administrator can be informed about infections. - -Functions: -- All sendmail functions can still be used - Example: SMTP authentication, anti-relaying, anti-spam -- Easy installation and integration into sendmail -- Hourly or daily update of the scan engine and the virus definition files - via the Internet -- Checking of incoming and outgoing mails -- Dependable detection of viruses and unwanted programs in real time -- Configurable response to a detected virus or unwanted program -- Isolation of infected and suspicious files in a quarantine directory -- LOG file can be used as a protocol via mail traffic -- Immediate activation, if new virus definition file (.VDF) is available -- Heuristic macro-virus detection -- Modifiable templates to create own alert messages -- Scanning in archives (28 formats are supported) - -http://www.free-av.de/cgi-bin/ubb/ultimatebb.cgi (Support English/German) -http://www.antivir.de/ (German) -WWW: http://www.hbedv.com/ diff --git a/security/antivir-milter/pkg-message b/security/antivir-milter/pkg-message deleted file mode 100644 index 59d9fcfb91b4..000000000000 --- a/security/antivir-milter/pkg-message +++ /dev/null @@ -1,28 +0,0 @@ -=========================================================================== - -In order to configure Sendmail for this port add the following lines to -your SENDMAIL_MC: - -INPUT_MAIL_FILTER( - `antivir-milter', - `S=unix:/var/spool/avmilter/avmilter.sock, F=T, T=S:10m;R:10m;E:10m' -)dnl - -Don't forget to rebuild sendmail.cf and to restart Sendmail afterwards. - -For automated updates of the anti-virus engine and the virus definition -file either add the following line to your /etc/crontab to run them via -cron(8): -25 0 * * * root %%PREFIX%%/sbin/antivirupdater -q -or execute the following command to enabled the AntiVir Updater daemon: -cp %%PREFIX%%/etc/rc.d/avupdater.sh-dist_avmilter \ -%%PREFIX%%/etc/rc.d/avupdater.sh - -For full functionality of AntiVir Milter you need to obtain a license -key from H+BEDV Datentechnik GmbH. To install it, execute the following -commands: -cp hbedv.key %%PREFIX%%/AntiVir/ -chown root:smmsp %%PREFIX%%/AntiVir/hbedv.key -chmod 440 %%PREFIX%%/AntiVir/hbedv.key - -=========================================================================== diff --git a/security/antivir-milter/pkg-plist b/security/antivir-milter/pkg-plist deleted file mode 100644 index aa03e827f27e..000000000000 --- a/security/antivir-milter/pkg-plist +++ /dev/null @@ -1,106 +0,0 @@ -@unexec if cmp -s %D/AntiVir/antivir-dist_avmilter %D/AntiVir/antivir; then rm -f %D/AntiVir/antivir; fi -AntiVir/antivir-dist_avmilter -@exec [ -f %B/antivir ] || cp -p %B/%f %B/antivir -@unexec if cmp -s %D/AntiVir/antivir0.vdf-dist_avmilter %D/AntiVir/antivir0.vdf; then rm -f %D/AntiVir/antivir0.vdf; fi -AntiVir/antivir0.vdf-dist_avmilter -@exec [ -f %B/antivir0.vdf ] || cp -p %B/%f %B/antivir0.vdf -@unexec if cmp -s %D/AntiVir/antivir1.vdf-dist_avmilter %D/AntiVir/antivir1.vdf; then rm -f %D/AntiVir/antivir1.vdf; fi -AntiVir/antivir1.vdf-dist_avmilter -@exec [ -f %B/antivir1.vdf ] || cp -p %B/%f %B/antivir1.vdf -@unexec if cmp -s %D/AntiVir/antivir2.vdf-dist_avmilter %D/AntiVir/antivir2.vdf; then rm -f %D/AntiVir/antivir2.vdf; fi -AntiVir/antivir2.vdf-dist_avmilter -@exec [ -f %B/antivir2.vdf ] || cp -p %B/%f %B/antivir2.vdf -@unexec if cmp -s %D/AntiVir/antivir3.vdf-dist_avmilter %D/AntiVir/antivir3.vdf; then rm -f %D/AntiVir/antivir3.vdf; fi -AntiVir/antivir3.vdf-dist_avmilter -@exec [ -f %B/antivir3.vdf ] || cp -p %B/%f %B/antivir3.vdf -@dirrmtry AntiVir/updcomp -@unexec rmdir %D/AntiVir 2> /dev/null || echo "If permanently deleting this package, %D/AntiVir and its contents must be removed manually." -bin/avq -bin/avqrm -@unexec if cmp -s %D/etc/avmilter/avmilter.conf.sample %D/etc/avmilter/avmilter.conf; then rm -f %D/etc/avmilter/avmilter.conf; else echo "If permanently deleting this package, %D/etc/avmilter/avmilter.conf must be removed manually."; fi -etc/avmilter/avmilter.conf.sample -@exec [ -f %B/avmilter.conf ] || cp %B/%f %B/avmilter.conf -@unexec if cmp -s %D/etc/avmilter/avmilter.ignore.sample %D/etc/avmilter/avmilter.ignore; then rm -f %D/etc/avmilter/avmilter.ignore; else echo "If permanently deleting this package, %D/etc/avmilter/avmilter.ignore must be removed manually."; fi -etc/avmilter/avmilter.ignore.sample -@exec [ -f %B/avmilter.ignore ] || cp %B/%f %B/avmilter.ignore -@unexec if cmp -s %D/etc/avmilter/avmilter.scan.sample %D/etc/avmilter/avmilter.scan; then rm -f %D/etc/avmilter/avmilter.scan; else echo "If permanently deleting this package, %D/etc/avmilter/avmilter.scan must be removed manually."; fi -etc/avmilter/avmilter.scan.sample -@exec [ -f %B/avmilter.scan ] || cp %B/%f %B/avmilter.scan -@unexec if cmp -s %D/etc/avmilter/avmilter.warn.sample %D/etc/avmilter/avmilter.warn; then rm -f %D/etc/avmilter/avmilter.warn; else echo "If permanently deleting this package, %D/etc/avmilter/avmilter.warn must be removed manually."; fi -etc/avmilter/avmilter.warn.sample -@exec [ -f %B/avmilter.warn ] || cp %B/%f %B/avmilter.warn -@unexec rmdir %D/etc/avmilter 2> /dev/null || echo "If permanently deleting this package, %D/etc/avmilter and its contents must be removed manually." -@unexec if cmp -s %D/etc/antivir.conf.sample %D/etc/antivir.conf; then rm -f %D/etc/antivir.conf; else echo "If permanently deleting this package, %D/etc/antivir.conf must be removed manually."; fi -etc/antivir.conf.sample -@exec [ -f %B/antivir.conf ] || cp %B/%f %B/antivir.conf -@cwd / -etc/antivir.conf -@exec ln -sf %%LOCALBASE%%/%F %D/%F -@cwd %%LOCALBASE%% -etc/rc.d/avmilter.sh -etc/rc.d/avupdater.sh-dist_avmilter -@unexec if [ -f %B/avupdater.sh ]; then echo "If permanently deleting this package, %B/avupdater.sh must be removed manually."; fi -sbin/antivirupdater -sbin/avmilter.bin -@exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter -@exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/incoming -@exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/outgoing -@exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/rejected -@unexec rmdir /var/spool/avmilter/incoming 2> /dev/null || true -@unexec rmdir /var/spool/avmilter/outgoing 2> /dev/null || true -@unexec rmdir /var/spool/avmilter/rejected 2> /dev/null || true -@unexec rmdir /var/spool/avmilter 2> /dev/null || echo "If permanently deleting this package, /var/spool/avmilter and its contents must be removed manually." -%%EXAMPLESDIR%%/templates/de/patho-administrator -%%EXAMPLESDIR%%/templates/de/patho-recipient -%%EXAMPLESDIR%%/templates/de/patho-sender -%%EXAMPLESDIR%%/templates/de/virus-administrator -%%EXAMPLESDIR%%/templates/de/virus-recipient -%%EXAMPLESDIR%%/templates/de/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/de -%%EXAMPLESDIR%%/templates/en/patho-administrator -%%EXAMPLESDIR%%/templates/en/patho-recipient -%%EXAMPLESDIR%%/templates/en/patho-sender -%%EXAMPLESDIR%%/templates/en/virus-administrator -%%EXAMPLESDIR%%/templates/en/virus-recipient -%%EXAMPLESDIR%%/templates/en/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/en -%%EXAMPLESDIR%%/templates/es/patho-administrator -%%EXAMPLESDIR%%/templates/es/patho-recipient -%%EXAMPLESDIR%%/templates/es/patho-sender -%%EXAMPLESDIR%%/templates/es/virus-administrator -%%EXAMPLESDIR%%/templates/es/virus-recipient -%%EXAMPLESDIR%%/templates/es/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/es -%%EXAMPLESDIR%%/templates/hu/patho-administrator -%%EXAMPLESDIR%%/templates/hu/patho-recipient -%%EXAMPLESDIR%%/templates/hu/patho-sender -%%EXAMPLESDIR%%/templates/hu/virus-administrator -%%EXAMPLESDIR%%/templates/hu/virus-recipient -%%EXAMPLESDIR%%/templates/hu/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/hu -%%EXAMPLESDIR%%/templates/it/patho-administrator -%%EXAMPLESDIR%%/templates/it/patho-recipient -%%EXAMPLESDIR%%/templates/it/patho-sender -%%EXAMPLESDIR%%/templates/it/virus-administrator -%%EXAMPLESDIR%%/templates/it/virus-recipient -%%EXAMPLESDIR%%/templates/it/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/it -%%EXAMPLESDIR%%/templates/nl/patho-administrator -%%EXAMPLESDIR%%/templates/nl/patho-recipient -%%EXAMPLESDIR%%/templates/nl/patho-sender -%%EXAMPLESDIR%%/templates/nl/virus-administrator -%%EXAMPLESDIR%%/templates/nl/virus-recipient -%%EXAMPLESDIR%%/templates/nl/virus-sender -@dirrm %%EXAMPLESDIR%%/templates/nl -@dirrm %%EXAMPLESDIR%%/templates -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.DE -%%PORTDOCS%%%%DOCSDIR%%/MANUAL -%%PORTDOCS%%%%DOCSDIR%%/README.gpg -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/antivir.gpg -%%PORTDOCS%%%%DOCSDIR%%/avmilter_de.pdf -%%PORTDOCS%%%%DOCSDIR%%/avmilter_en.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/security/finger_mysql/Makefile b/security/finger_mysql/Makefile deleted file mode 100644 index b2f316df358c..000000000000 --- a/security/finger_mysql/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Ports collection makefile for: finger_mysql -# Date created: 03 Mar 2003 -# Whom: Yonatan <onatan@gmail.com> -# -# $FreeBSD$ -# - -PORTNAME= finger_mysql -PORTVERSION= 1.0 -CATEGORIES= security -MASTER_SITES= http://www.zone-h.org/files/49/ \ - http://downloads.securityfocus.com/vulnerabilities/exploits/ -DISTNAME= finger_mysql.c -EXTRACT_SUFX= #none -EXTRACT_ONLY= #none - -MAINTAINER= onatan@gmail.com -COMMENT= Threaded MySQL scanner - -LIB_DEPENDS= mysqlclient:${PORTSDIR}/databases/mysql323-client/ - -BROKEN= does not fetch -DEPRECATED= project has closed -EXPIRATION_DATE= 2006-09-04 - -NO_WRKSUBDIR= yes -PLIST_FILES= bin/finger_mysql - -post-extract: - ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/ - -do-build: - ${CC} ${CFLAGS} -L${PREFIX}/lib/mysql -I${PREFIX}/include ${PTHREAD_LIBS} -lmysqlclient -o ${WRKSRC}/finger_mysql ${WRKSRC}/${DISTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/finger_mysql ${PREFIX}/bin - -.include <bsd.port.mk> diff --git a/security/finger_mysql/distinfo b/security/finger_mysql/distinfo deleted file mode 100644 index f31c09ae2f07..000000000000 --- a/security/finger_mysql/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (finger_mysql.c) = 780669d83a76c63f40efab6e34716508 -SHA256 (finger_mysql.c) = ebd717866465390bfee524665cb83bae97de1fe2c9627126f562e95dfa530a1c -SIZE (finger_mysql.c) = 11969 diff --git a/security/finger_mysql/pkg-descr b/security/finger_mysql/pkg-descr deleted file mode 100644 index b8f08ada17e5..000000000000 --- a/security/finger_mysql/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a threaded C class IP MySQL scanner that will attempt to login -and extract the hashes from a vulnerable MySQL daemon. See -http://online.securityfocus.com/bid/5503 for all the details. diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile deleted file mode 100644 index a4f45302cefc..000000000000 --- a/www/firefox10/Makefile +++ /dev/null @@ -1,122 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ -# - -PORTNAME= firefox -DISTVERSION= 1.0.8 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source \ - ahze/:local -DISTFILES= ${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX} \ - libart_lgpl-1${EXTRACT_SUFX}:local - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla - -FORBIDDEN= http://vuxml.FreeBSD.org/e2a92664-1d60-11db-88cf-000c6ec775d9.html -EXPIRATION_DATE=2006-08-27 - -LATEST_LINK= ${PORTNAME}10 -USE_X_PREFIX= yes -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ - -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FIREFOX_ICON= ${MOZILLA}.xpm -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZILLA_NAME= Firefox${MOZILLA_SUFX} -MOZILLA_SUFX= 10 -MOZ_EXTENSIONS+=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth -MOZ_EXPORT+= MOZ_INTERNAL_LIBART_LGPL=1 -MOZ_MK_OPTIONS+=MOZ_INTERNAL_LIBART_LGPL=1 -PORT_MOZCONFIG= ${WRKSRC}/browser/config/mozconfig -MOZ_OPTIONS= --disable-ldap \ - --enable-application=browser \ - --enable-official-branding \ - --program-transform-name='s/firefox/${MOZILLA}/' \ - --enable-svg \ - --enable-svg-renderer-libart - -SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= NEWTAB "Open external links in a new tab" on \ - SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on alpha during post-build -.endif - -# libart patches -.if ${OSVERSION} < 500035 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-extract:: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -post-patch: -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor - -pre-install: - ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} -.if !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} >> ${SYSTEM_PREFS} - ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} - ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ - >> ${SYSTEM_PREFS} -.endif # !defined(WITHOUT_NEWTAB) - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} - -.include "${.CURDIR}/../mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/firefox10/distinfo b/www/firefox10/distinfo deleted file mode 100644 index 1fb9ee56772f..000000000000 --- a/www/firefox10/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (firefox-1.0.8-source.tar.bz2) = fda8175ccf756df346df5bc95bfb217f -SHA256 (firefox-1.0.8-source.tar.bz2) = a3b158d887f93aecab010832de8275256096173f7c21694091f9feaeedc74e78 -SIZE (firefox-1.0.8-source.tar.bz2) = 32801632 -MD5 (libart_lgpl-1.tar.bz2) = c6dba83a091336ef8abdb7c85694f16e -SHA256 (libart_lgpl-1.tar.bz2) = cd964fb67183c048f2c245ee26beeade29f3109e947c6d8a8993374c8f8392df -SIZE (libart_lgpl-1.tar.bz2) = 102977 diff --git a/www/firefox10/files/extra-patch-config_make-jars.pl b/www/firefox10/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca459..000000000000 --- a/www/firefox10/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/firefox10/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/firefox10/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp deleted file mode 100644 index 758c0146c87b..000000000000 --- a/www/firefox10/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp +++ /dev/null @@ -1,88 +0,0 @@ ---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Wed Mar 2 12:36:59 2005 -+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Wed Mar 2 12:36:37 2005 -@@ -56,6 +56,13 @@ - #include "nsArray.h" - #include "nsDataHashtable.h" - -+ -+#ifdef HAVE_CPP_2BYTE_WCHAR_T -+ typedef nsDependentString nsLiteralString; -+#else -+ typedef NS_ConvertASCIItoUTF16 nsLiteralString; -+#endif -+ - /** - * \addtogroup libart_renderer Libart Rendering Engine - * @{ -@@ -112,7 +119,7 @@ - nsCOMPtr<nsISVGGlyphMetricsSource> mSource; - - public: -- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; -+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; - }; - - /** @} */ -@@ -120,7 +127,7 @@ - //---------------------------------------------------------------------- - // nsSVGLibartGlyphMetricsFT implementation: - --nsDataHashtable<nsStringHashKey,nsDependentString*> -+nsDataHashtable<nsStringHashKey,nsLiteralString*> - nsSVGLibartGlyphMetricsFT::sFontAliases; - - -@@ -155,15 +162,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsLiteralString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsLiteralString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsLiteralString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -406,7 +413,7 @@ - } - else { - // try alias if there is one: -- nsDependentString *alias = nsnull; -+ nsLiteralString *alias = nsnull; - nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), - &alias); - if (alias) { -@@ -440,19 +447,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/firefox10/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp b/www/firefox10/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp deleted file mode 100644 index 84392bd4acdf..000000000000 --- a/www/firefox10/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $ - -diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/firefox10/files/firefox.desktop.in b/www/firefox10/files/firefox.desktop.in deleted file mode 100644 index 2a0a3cdca71d..000000000000 --- a/www/firefox10/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %U -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/firefox10/files/moz_pis_S50cleanhome b/www/firefox10/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e39f2..000000000000 --- a/www/firefox10/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/firefox10/files/patch-Double.cpp b/www/firefox10/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff4fe..000000000000 --- a/www/firefox10/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/firefox10/files/patch-browser_app_mozilla.in b/www/firefox10/files/patch-browser_app_mozilla.in deleted file mode 100644 index 414bc881e492..000000000000 --- a/www/firefox10/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,471 +0,0 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 - else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi -+ done -+ cd "${here}" - fi - if [ $found = 0 ]; then -- # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin="$moz_libdir" -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi --fi -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -browser) -+ # browser is default for firefox -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -- # Last argument seems to be a local file/directory -- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) -- # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then -+ target="${here}/${target}" -+ fi -+ if [ -r "${target}" -o -d "${target}" ]; then -+ [ -n "${use_openFile}" ] || target="file://${target}" -+ else -+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 -+ ALREADY_RUNNING= # null -+ fi - else -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -pure) -- MOZILLA_BIN="${MOZILLA_BIN}.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- # Move the unrecognized argument to the end of the list. -- arg="$1" -- shift -- set -- "$@" "$arg" -- pass_arg_count=`expr $pass_arg_count + 1` -- ;; -- esac --done -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${use_openFile}" ]; then -+ _remote_cmd="openFile(${target})" -+ elif [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" -+ else -+ _remote_cmd="openURL(${target})" -+ fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi -+fi -+ -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi - --export MRE_HOME -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/www/firefox10/files/patch-bugzilla149334 b/www/firefox10/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox10/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/firefox10/files/patch-build_unix_run-mozilla.sh b/www/firefox10/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 38a4162a4cd7..000000000000 --- a/www/firefox10/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:{MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/firefox10/files/patch-config-mkdepend-imakemdep.h b/www/firefox10/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/www/firefox10/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/firefox10/files/patch-config-rules.mk b/www/firefox10/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194dcc..000000000000 --- a/www/firefox10/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/firefox10/files/patch-config::mkdepend::Makefile.in b/www/firefox10/files/patch-config::mkdepend::Makefile.in deleted file mode 100644 index bace012a282e..000000000000 --- a/www/firefox10/files/patch-config::mkdepend::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox10/files/patch-config_autoconf.mk.in b/www/firefox10/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516d1d..000000000000 --- a/www/firefox10/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/firefox10/files/patch-configure b/www/firefox10/files/patch-configure deleted file mode 100644 index 9e60372adb33..000000000000 --- a/www/firefox10/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/firefox10/files/patch-extensions_p3p_Makefile.in b/www/firefox10/files/patch-extensions_p3p_Makefile.in deleted file mode 100644 index efade70e981b..000000000000 --- a/www/firefox10/files/patch-extensions_p3p_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- extensions/p3p/Makefile.in.orig Sun Jul 9 14:10:16 2006 -+++ extensions/p3p/Makefile.in Sun Jul 9 14:20:10 2006 -@@ -62,23 +62,23 @@ - p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/10/18/P3Pv1 \ -- -DHAS_TMPL_RETENTION\ -+ -DHAS_TMPL_RETENTION \ - $< > $@ - - p3p200012.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/12/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200109.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2001/09/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200201.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \ -- -DHAS_CALL_OURS -DHAS_PURPOSE_SRC\ -+ -DHAS_CALL_OURS -DHAS_PURPOSE_SRC \ - $< > $@ diff --git a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74f62..000000000000 --- a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b4334d..000000000000 --- a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox10/files/patch-gfx-src-gtk-Makefile.in b/www/firefox10/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox10/files/patch-gfx-src-gtk-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not -contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. - -This causes an error, because libgfxshared_s is only under dist/lib. - - -mi - ---- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 -+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 -@@ -165,4 +165,5 @@ - ifdef MOZ_ENABLE_GTK2 - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ -+ $(LIBS_DIR) \ - -lgkgfx \ - -lgfxshared_s \ diff --git a/www/firefox10/files/patch-libm b/www/firefox10/files/patch-libm deleted file mode 100644 index 7de64b2a5068..000000000000 --- a/www/firefox10/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox10/files/patch-security-coreconf-FreeBSD.mk b/www/firefox10/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14acaaf2..000000000000 --- a/www/firefox10/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/firefox10/files/patch-sysnss b/www/firefox10/files/patch-sysnss deleted file mode 100644 index d854cabc053a..000000000000 --- a/www/firefox10/files/patch-sysnss +++ /dev/null @@ -1,178 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 -+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 -@@ -37,16 +37,7 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) -@@ -132,9 +123,4 @@ - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - -@@ -153,43 +139,4 @@ - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ -@@ -200,18 +147,4 @@ - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -227,9 +160,4 @@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/firefox10/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox10/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/www/firefox10/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/firefox10/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox10/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4602..000000000000 --- a/www/firefox10/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a7a7..000000000000 --- a/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/firefox10/files/patch-xptcall-alpha b/www/firefox10/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/www/firefox10/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/firefox10/files/patch-xptcall-sparc64 b/www/firefox10/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/www/firefox10/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/firefox10/pkg-descr b/www/firefox10/pkg-descr deleted file mode 100644 index 99b11c5e72e2..000000000000 --- a/www/firefox10/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Firefox is an award winning, free, open-source web browser for many platforms -and is based on the Mozilla codebase. It is small, fast and easy to use, and -offers many advanced features: - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security - -WWW: http://www.mozilla.org/products/firefox/ diff --git a/www/firefox10/pkg-message b/www/firefox10/pkg-message deleted file mode 100644 index fb017f9a30c0..000000000000 --- a/www/firefox10/pkg-message +++ /dev/null @@ -1,32 +0,0 @@ -====================================================================== - -SMB issues: -Network group, machine, and share browsing does not work correctly. - -SFTP: -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -The SSH sever on remote_host must allow pub key authentication. - -====================================================================== - -Any bug reports should be addressed to the maintainers at: - gnome@FreeBSD.org -You may also Cc: freebsd-ports@freebsd.org. Please do not send -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Date/time stamp from www/firefox10/Makefile. -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gnome@) -====================================================================== |