Attachment 36931 Details for Bug 58999 – file.diff

[patch] file.diff

file.diff (text/plain), 25.25 KB, created by Chris Knight on 2003-11-06 11:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Knight

Created: 2003-11-06 11:10:11 UTC

Size: 25.25 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/Makefile,v
>retrieving revision 1.23
>diff -u -r1.23 Makefile
>--- Makefile	10 Sep 2003 09:58:27 -0000	1.23
>+++ Makefile	6 Nov 2003 10:55:57 -0000
>@@ -2,25 +2,32 @@
> # Date created:		20 December 2000
> # Whom:			Geoffrey C. Speicher <geoff@sea-incorporated.com>
> #
>-# $FreeBSD: ports/databases/firebird/Makefile,v 1.23 2003/09/10 09:58:27 netchild Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	firebird
>-PORTVERSION=	1.0.2
>+PORTVERSION=	1.5.r6
> CATEGORIES=	databases
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
>-		http://www.aims.com.au/chris/firebird/
>+MASTER_SITES=	http://www.aims.net.au/chris/firebird/
> MASTER_SITE_SUBDIR=firebird
>-DISTFILES=	bootkit-1.0.2.908.tar.gz \
>-		interbase0.9-4-v5examples.tar.gz \
>-		Firebird-1.0.2.908.src.tar.gz
>+DISTNAME=	firebird15-20031106
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	chris@e-easy.com.au
> COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
> 
>-FORBIDDEN=	Local Stack Overflow, see http://packetstormsecurity.nl/0305-exploits/dsr-adv001.txt
>+USE_BZIP2=	yes
>+USE_GMAKE=	yes
>+USE_LIBTOOL=	yes
>+GNU_CONFIGURE=	yes
>+WANT_AUTOCONF_VER=	253
>+USE_GCC=	3.3
> 
>-WRKSRC=		${WRKDIR}/firebird-1.0.2.908
>+# Don't use ld for linking, use gcc
>+LD=	gcc
>+
>+CONFLICTS=	firebird-devel-*
>+
>+WRKSRC=		${WRKDIR}/firebird15
> INSTALLS_SHLIB=	yes
> LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
> MSG_FILE=	${PKGDIR}/pkg-message
>@@ -36,76 +43,26 @@
> 	@${ECHO_MSG} "require NFS client locking support for the build to"
> 	@${ECHO_MSG} "succeed. Currently this is only available on FreeBSD 5.0"
> 	@${ECHO_MSG} "or greater."
>+	@${ECHO_MSG}
>+	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
>+	@${ECHO_MSG} "changed since version 1.0.x."
>+	@${ECHO_MSG} "Cancel this installation now and backup your databases"
>+	@${ECHO_MSG} "if you have not already done so."
> .if !defined(BATCH)
>-	@sleep 5
>+	@sleep 10
> .endif
> 
>-do-extract:
>-	@${MKDIR} ${WRKDIR}
>-	@(								\
>-	cd ${WRKDIR}; ${TAR} -zxf					\
>-		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
>-	cd firebird-1.0.2.908;						\
>-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
>-	${CP} -f msgs/msg.gbak misc/msg.gbak				\
>-	)
>-
>-post-patch:
>-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
>-.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
>-	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
>-		 ${WRKSRC}/builds/original/prefix.freebsd
>-.else
>-	@${REINPLACE_CMD} -e 's,^crypt_set_format.*,,' ${WRKSRC}/jrd/enc.c
>-.endif
>+patch-libtool:
>+	@${DO_NADA}
> 
> do-configure:
>-	@(								\
>-	cd ${WRKDIR}/firebird-1.0.2.908;				\
>-	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
>-	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
>-	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
>-	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
>-	${SH} Configure.sh PROD FREEBSD;				\
>-	)
>+	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
> 
> do-build:
> 	@(								\
>-	${REINPLACE_CMD} -e 's,opt,usr,'				\
>-		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
>-	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
>-		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
>-	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
>-		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
>-	cd ${WRKDIR}/firebird-1.0.2.908;				\
>-	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
>-	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
>-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
>-	${SH} buildit.sh;						\
>-	)
>-
>-pre-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>-
>-do-install:
>-	@(								\
>-	cd ${WRKDIR}/firebird-1.0.2.908;				\
>-	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
>-	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
>-	${TOUCH} interbase/interbase.log;				\
>-	${CP} -Rp interbase ${PREFIX}/firebird;				\
>-	${RM} ${PREFIX}/firebird/install;				\
>-	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
>-	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
>-	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
>-	cd ${PREFIX}/firebird/examples;					\
>-	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
>-	${CP} ${FILESDIR}/RELNOTES ${PREFIX}/firebird/;			\
>-	${CP} ${WRKSRC}/firebird/install/linux/misc/ibmgr		\
>-		${PREFIX}/firebird/bin;					\
>+	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE};	\
>+	cd ${WRKSRC};							\
>+	${ENV} CC=${CC} CXX=${CXX} ${GMAKE} all;			\
> 	)
>-
>-post-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- distinfo	16 Jan 2003 11:52:00 -0000	1.3
>+++ distinfo	6 Nov 2003 10:55:57 -0000
>@@ -1,3 +1 @@
>-MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
>-MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
>-MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
>+MD5 (firebird15-20031106.tar.bz2) = d67809e31d2583ef109381628699cb7e
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/pkg-descr,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-descr
>--- pkg-descr	22 Nov 2002 23:30:24 -0000	1.4
>+++ pkg-descr	6 Nov 2003 10:55:57 -0000
>@@ -11,14 +11,12 @@
> 
> For more information on Firebird and InterBase, see:
> 
>-http://sourceforge.net/projects/firebird/
>-http://www.ibphoenix.com/
>-http://www.interbase2000.org/
>-http://www.interbase.com/
>-http://www.firebirdsql.org/
>+WWW: http://sourceforge.net/projects/firebird/
>+WWW: http://www.ibphoenix.com/
>+WWW: http://www.interbase2000.org/
>+WWW: http://www.interbase.com/
>+WWW: http://www.firebirdsql.org/
> 
> For more information on the locksmith back door, see:
> 
>-https://www.kb.cert.org/vuls/id/247371
>-
>-WWW: http://sourceforge.net/projects/firebird/
>+WWW: https://www.kb.cert.org/vuls/id/247371
>Index: pkg-install
>===================================================================
>RCS file: pkg-install
>diff -N pkg-install
>--- pkg-install	11 May 2003 03:18:17 -0000	1.6
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,147 +0,0 @@
>-#!/bin/sh
>-
>-case $2 in
>-PRE-INSTALL)
>-
>-if [ -d $PKG_PREFIX/firebird ]; then
>-	if [ -d $PKG_PREFIX/firebird.old ]; then
>-		rm -rf $PKG_PREFIX/firebird.old
>-	fi
>-	mv $PKG_PREFIX/firebird $PKG_PREFIX/firebird.old
>-fi
>-
>-if [ `id -u` -ne 0 ]; then
>-	echo; echo "You must be root to run this step!"; echo; echo
>-  exit 1
>-fi
>-
>-nofbuid=0
>-fbUID=`id -u firebird 2>/dev/null`
>-if [ $? -ne 0 ]; then
>-	fbUID=90
>-	while [ ! -z `id -un $fbUID 2>/dev/null` ]
>-	do
>-		fbUID=$(($fbUID+1))
>-	done
>-	nofbuid=1
>-fi
>-
>-fbGID=`pw groupshow firebird 2>/dev/null`
>-if [ $? -ne 0 ]; then
>-	fbGID=90
>-	while [ ! -z `id -gn $fbGID 2>/dev/null` ]
>-	do
>-		fbGID=$(($fbGID+1))
>-	done
>-	echo "firebird:*:$fbGID" >> /etc/group
>-else
>-	fbGID=`echo $fbGID | awk -F: '{print $3}'`
>-fi
>-
>-echo "firebird user using uid $fbUID"
>-echo "firebird user using gid $fbGID"
>-
>-if which -s pw; then
>-	if [ $nofbuid -ne 0 ]; then
>-		pw useradd firebird -u $fbUID -g $fbGID -h - -s /bin/sh \
>-			-d $PKG_PREFIX/firebird -c "Firebird pseudo-user"
>-	fi
>-else
>-	echo -n "unable to create user firebird - please create it manually,"
>-	echo " before reinstalling this package."
>-	exit 1
>-fi
>-;;
>-
>-POST-INSTALL)
>-chown -R firebird:firebird $PKG_PREFIX/firebird
>-
>-# Now fix up the mess.
>-
>-# fix up directories
>-for i in `find $PKG_PREFIX/firebird -print`
>-  do
>-    FileName=$i
>-    if [ -d $FileName ]
>-       then
>-         chmod u=rwx,go=rx $FileName
>-     fi
>-  done
>-
>-# make lib ldconfig-compatible
>-chown -R root:wheel $PKG_PREFIX/firebird/lib
>-
>-# make the following read-only
>-chmod -R a=r $PKG_PREFIX/firebird/UDF/*
>-chmod -R a=r $PKG_PREFIX/firebird/include/*
>-chmod -R a=r $PKG_PREFIX/firebird/intl/*
>-chmod -R a=r $PKG_PREFIX/firebird/lib/*
>-
>-# Fix UDF load problem
>-cd $PKG_PREFIX/firebird/lib
>-ln -sf ib_util.so libib_util.so
>-ln -sf gds.so libgds.so.1
>-
>-cd $PKG_PREFIX/firebird/bin
>-
>-# all users can run everything.
>-chmod a=rx *
>-
>-# SUID is needed for running server programs.
>-
>-for i in gds_lock_mgr gds_drop gds_inet_server
>-  do
>-    chmod ug+s $i
>-  done
>-
>-
>-# Lock files
>-
>-cd $PKG_PREFIX/firebird
>-
>-for i in isc_init1 isc_lock1 isc_event1
>-  do
>-    FileName=$i.`hostname`
>-    touch $FileName
>-    chmod uga=rw $FileName
>-    chown firebird:firebird $FileName
>-  done
>-
>-touch interbase.log
>-chmod u=rw,go= interbase.log
>-chmod a=r interbase.msg
>-
>-# make databases writable by interbase only
>-# local database connections are not a good idea
>-chmod u=rw,go= examples/v5/*.gdb
>-chmod u=rw,go= help/*.gdb
>-chmod u=rw,go= isc4.gdb
>-
>-# remove any existing gds service
>-cp /etc/services /etc/services.old
>-cp /etc/inetd.conf /etc/inetd.conf.old
>-cat /etc/services |grep -v gds_db >/etc/services.new
>-cat /etc/inetd.conf |grep -v gds_db >/etc/inetd.conf.new
>-mv /etc/services.new /etc/services
>-mv /etc/inetd.conf.new /etc/inetd.conf
>-
>-# add the gds service and restart inetd
>-cat >>/etc/services <<EOF
>-gds_db		 3050/tcp  #InterBase Database Remote Protocol
>-EOF
>-cat >>/etc/inetd.conf <<EOF
>-gds_db	stream	tcp	nowait	firebird	$PKG_PREFIX/firebird/bin/gds_inet_server  gds_inet_server
>-EOF
>-if [ -f /var/run/inetd.pid ]; then
>-	kill -HUP `cat /var/run/inetd.pid`
>-fi
>-
>-# shared lib startup script
>-if [ -d $PKG_PREFIX/etc/rc.d ]; then
>-	(
>-	echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/firebird/lib ] && /sbin/ldconfig -m $PKG_PREFIX/firebird/lib"
>-	) > $PKG_PREFIX/etc/rc.d/000.firebird.sh
>-  chmod a=rx $PKG_PREFIX/etc/rc.d/000.firebird.sh
>-fi
>-;;
>-esac
>Index: pkg-message
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/pkg-message,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-message
>--- pkg-message	11 May 2003 03:18:17 -0000	1.2
>+++ pkg-message	6 Nov 2003 10:55:57 -0000
>@@ -1,8 +1,9 @@
> 
> ---------------------------------------------------------
> Firebird is now installed.  A symbolic link from
>-/usr/interbase -> %%PREFIX%%/firebird is REQUIRED for
>-proper operation of Firebird.
>+/usr/interbase -> %%PREFIX%%/firebird may be needed
>+for compatibility with existing  programs that use
>+Firebird.
> 
> The symbolic link can be created with:
> 
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- pkg-plist	16 Jan 2003 11:52:00 -0000	1.4
>+++ pkg-plist	6 Nov 2003 10:55:57 -0000
>@@ -1,111 +1,121 @@
> etc/rc.d/000.firebird.sh
>-firebird/intl/gdsintl
>-firebird/examples/v5/ib_udf.sql
>-firebird/examples/v5/README
>-firebird/examples/v5/align.h
>-firebird/examples/v5/api1.c
>-firebird/examples/v5/api10.c
>-firebird/examples/v5/api11.c
>-firebird/examples/v5/api12.c
>-firebird/examples/v5/api13.c
>-firebird/examples/v5/api14.e
>-firebird/examples/v5/api15.c
>-firebird/examples/v5/api16.c
>-firebird/examples/v5/api16t.c
>-firebird/examples/v5/api2.c
>-firebird/examples/v5/api3.c
>-firebird/examples/v5/api4.c
>-firebird/examples/v5/api5.c
>-firebird/examples/v5/api6.c
>-firebird/examples/v5/api7.c
>-firebird/examples/v5/api8.c
>-firebird/examples/v5/api9.c
>-firebird/examples/v5/api9f.c
>-firebird/examples/v5/apifull.c
>-firebird/examples/v5/employe2.sql
>-firebird/examples/v5/dyn1.e
>-firebird/examples/v5/dyn2.e
>-firebird/examples/v5/dyn3.e
>-firebird/examples/v5/dyn4.e
>-firebird/examples/v5/dyn5.e
>-firebird/examples/v5/dynfull.e
>-firebird/examples/v5/employee.gbk
>-firebird/examples/v5/employee.gdb
>-firebird/examples/v5/example.h
>-firebird/examples/v5/api9f.sql
>-firebird/examples/v5/intlemp.gbk
>-firebird/examples/v5/intlemp.gdb
>-firebird/examples/v5/stat1.e
>-firebird/examples/v5/stat10.e
>-firebird/examples/v5/stat11.e
>-firebird/examples/v5/stat12.e
>-firebird/examples/v5/stat12t.e
>-firebird/examples/v5/stat2.e
>-firebird/examples/v5/stat3.e
>-firebird/examples/v5/stat4.e
>-firebird/examples/v5/stat5.e
>-firebird/examples/v5/stat6.e
>-firebird/examples/v5/stat7.e
>-firebird/examples/v5/stat8.e
>-firebird/examples/v5/stat9.e
>-firebird/examples/v5/udf.sql
>-firebird/examples/v5/udflib.c
>-firebird/examples/v5/makefile
>-firebird/include/perf.h
>-firebird/include/ib_util.h
>-firebird/include/gds.hxx
>+firebird/README
>+firebird/UDF/fbudf.so
>+firebird/UDF/fbudf.sql
>+firebird/UDF/ib_udf.so
>+firebird/UDF/ib_udf.sql
>+firebird/WhatsNew
>+firebird/aliases.conf
>+firebird/bin/fb_inet_server
>+firebird/bin/fb_lock_mgr
>+firebird/bin/fb_lock_print
>+firebird/bin/gbak
>+firebird/bin/gdef
>+firebird/bin/gds_drop
>+firebird/bin/gfix
>+firebird/bin/gpre
>+firebird/bin/gsec
>+firebird/bin/gstat
>+firebird/bin/isql
>+firebird/bin/qli
>+firebird/doc/README.NTSecurity
>+firebird/doc/README.build.mingw.html
>+firebird/doc/README.build.msvc.html
>+firebird/doc/README.instsvc
>+firebird/doc/README.makefiles
>+firebird/doc/README.user
>+firebird/doc/README.user.embedded
>+firebird/doc/README.user.troubleshooting
>+firebird/doc/sql.extensions/README.aggregate_tracking
>+firebird/doc/sql.extensions/README.case
>+firebird/doc/sql.extensions/README.coalesce
>+firebird/doc/sql.extensions/README.context_variables
>+firebird/doc/sql.extensions/README.data_types
>+firebird/doc/sql.extensions/README.exception_handling
>+firebird/doc/sql.extensions/README.execute_statement
>+firebird/doc/sql.extensions/README.explicit_locks
>+firebird/doc/sql.extensions/README.nullif
>+firebird/doc/sql.extensions/README.order_by_expressions_nulls
>+firebird/doc/sql.extensions/README.savepoints
>+firebird/doc/sql.extensions/README.universal_triggers
>+firebird/examples/align.h
>+firebird/examples/api1.c
>+firebird/examples/api10.c
>+firebird/examples/api11.c
>+firebird/examples/api12.c
>+firebird/examples/api13.c
>+firebird/examples/api14.e
>+firebird/examples/api15.c
>+firebird/examples/api16.c
>+firebird/examples/api16t.c
>+firebird/examples/api2.c
>+firebird/examples/api3.c
>+firebird/examples/api4.c
>+firebird/examples/api5.c
>+firebird/examples/api6.c
>+firebird/examples/api7.c
>+firebird/examples/api8.c
>+firebird/examples/api9.c
>+firebird/examples/api9f.c
>+firebird/examples/api9f.sql
>+firebird/examples/apifull.c
>+firebird/examples/dyn1.e
>+firebird/examples/dyn2.e
>+firebird/examples/dyn3.e
>+firebird/examples/dyn4.e
>+firebird/examples/dyn5.e
>+firebird/examples/dynfull.e
>+firebird/examples/employe2.sql
>+firebird/examples/employee.fdb
>+firebird/examples/employee.gbk
>+firebird/examples/example.h
>+firebird/examples/readme
>+firebird/examples/stat1.e
>+firebird/examples/stat10.e
>+firebird/examples/stat11.e
>+firebird/examples/stat12.e
>+firebird/examples/stat12t.e
>+firebird/examples/stat2.e
>+firebird/examples/stat3.e
>+firebird/examples/stat4.e
>+firebird/examples/stat5.e
>+firebird/examples/stat6.e
>+firebird/examples/stat7.e
>+firebird/examples/stat8.e
>+firebird/examples/stat9.e
>+firebird/examples/udf.sql
>+firebird/examples/udflib.c
>+firebird/firebird.conf
>+@unexec rm -f %D/firebird/firebird.log
>+firebird/firebird.msg
>+firebird/help/help.fdb
>+firebird/include/blr.h
> firebird/include/gds.h
>+firebird/include/ib_util.h
> firebird/include/ibase.h
> firebird/include/iberror.h
>-firebird/include/gds.f
>-firebird/UDF/ib_udf
>-firebird/lib/ib_util.so
>-firebird/lib/gds.a
>-firebird/lib/gds.so
>+firebird/include/perf.h
>+firebird/intl/fbintl
>+@unexec rm -f %D/firebird/isc_event1.`hostname`
>+@unexec rm -f %D/firebird/isc_init1.`hostname`
>+@unexec rm -f %D/firebird/isc_lock1.`hostname`
>+firebird/lib/libfbclient.so
>+firebird/lib/libfbclient.so.1
>+firebird/lib/libfbclient.so.1.5.0
>+firebird/lib/libfbembed.so
>+firebird/lib/libfbembed.so.1
>+firebird/lib/libfbembed.so.1.5.0
> firebird/lib/libgds.so
> firebird/lib/libgds.so.1
>-firebird/lib/libgds.a
> firebird/lib/libib_util.so
>-firebird/help/help.gbak
>-firebird/help/help.gdb
>-firebird/bin/ibguard
>-firebird/bin/ibmgr
>-firebird/bin/ibmgr.bin
>-firebird/bin/ibserver
>-firebird/bin/isc4.gbak
>-firebird/bin/gpre
>-firebird/bin/gds_pipe
>-firebird/bin/gds_drop
>-firebird/bin/gds_lock_mgr
>-firebird/bin/gfix
>-firebird/bin/gdef
>-firebird/bin/isql
>-firebird/bin/gds_lock_print
>-firebird/bin/qli
>-firebird/bin/gds_inet_server
>-firebird/bin/gsplit
>-firebird/bin/gstat
>-firebird/bin/gsec
>-firebird/bin/gbak
>-firebird/misc/firebird.init.d.generic
>-firebird/misc/firebird.init.d.mandrake
>-firebird/services.isc
>-firebird/isc_config
>-firebird/isc4.gdb
>-firebird/interbase.msg
>-firebird/interbase.log
>-firebird/inetd.conf.isc
>-firebird/README
>-firebird/RELNOTES
>-@dirrm firebird
>-@dirrm firebird/intl
>-@dirrm firebird/examples/v3
>-@dirrm firebird/examples/v4
>-@dirrm firebird/examples/v5
>+firebird/security.fdb
>+@dirrm firebird/UDF
>+@dirrm firebird/bin
>+@dirrm firebird/doc/sql.extensions
>+@dirrm firebird/doc
> @dirrm firebird/examples
>+@dirrm firebird/help
> @dirrm firebird/include
>-@dirrm firebird/UDF
>+@dirrm firebird/intl
> @dirrm firebird/lib
>-@dirrm firebird/help
>-@dirrm firebird/bin
>-@dirrm firebird/misc
>+@dirrm firebird
>Index: files/buildit.sh
>===================================================================
>RCS file: files/buildit.sh
>diff -N files/buildit.sh
>--- files/buildit.sh	11 Nov 2002 17:23:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,3 +0,0 @@
>-#!/bin/sh
>-. Configure_SetupEnv.sh
>-make super_firebird
>Index: files/patch-ae
>===================================================================
>RCS file: files/patch-ae
>diff -N files/patch-ae
>--- files/patch-ae	16 Jan 2003 11:52:00 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
>-+++ jrd/common.h	Sun Jan  5 16:49:05 2003
>-@@ -204,7 +204,7 @@
>- #define I386  1
>- #define VAX   1
>- #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
>--#define SETPGRP         setpgrp ()
>-+#define SETPGRP         setpgrp (0, 0)
>- #define ATEXIT(c)       atexit(c)
>- 
>- #define QUADFORMAT "ll"
>Index: files/patch-af
>===================================================================
>RCS file: files/patch-af
>diff -N files/patch-af
>--- files/patch-af	10 May 2002 13:28:53 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>---- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
>-+++ jrd/enc.c	Sun Nov 18 19:17:19 2001
>-@@ -31,6 +31,10 @@
>-  *
>-  **************************************/
>-
>-+#ifdef FREEBSD
>-+crypt_set_format("des");
>-+#endif
>-+
>- return CRYPT_FUNC( string, salt);
>- }
>- #endif
>Index: files/patch-ag
>===================================================================
>RCS file: files/patch-ag
>diff -N files/patch-ag
>--- files/patch-ag	10 May 2002 13:28:53 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- Configure.sh.orig	Tue Nov 20 05:00:25 2001
>-+++ Configure.sh	Fri Dec 28 19:11:50 2001
>-@@ -515,7 +515,7 @@
>- BuildBootFlg="No"
>- BuildHostType=""
>- BuildBuildType="PROD"
>--MasterSourceDir="`pwd`/refDatabases"
>-+MasterSourceDir="$REFDBPATH"
>- BuildIOsize=32
>- 
>- export BuildHostType
>Index: files/patch-autogen.sh
>===================================================================
>RCS file: files/patch-autogen.sh
>diff -N files/patch-autogen.sh
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-autogen.sh	6 Nov 2003 10:54:41 -0000
>@@ -0,0 +1,26 @@
>+--- autogen.sh.orig	Fri Apr 18 04:41:28 2003
>++++ autogen.sh	Sun Aug 24 18:39:45 2003
>+@@ -20,7 +20,7 @@
>+   ;;
>+ esac
>+ 
>+-VER=`libtool --version|grep ' libtool)'|sed 's/.*) $[0-9][0-9.]*$ .*/\1/'`
>++VER=`libtool13 --version|grep ' libtool)'|sed 's/.*) $[0-9][0-9.]*$ .*/\1/'`
>+ case "$VER" in
>+  0* | 1\.[0-2] | 1\.[0-2][a-z]* | \
>+  1\.3\.[0-2] | 1\.3\.[0-2][a-z]* )
>+@@ -50,12 +50,12 @@
>+ 
>+ # Generate configure from configure.in
>+ echo "Running libtoolize ..."
>+-LIBTOOL_M4=`libtoolize --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*$/[^']*$.*$,\1,"`
>++LIBTOOL_M4=`libtoolize13 --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*$/[^']*$.*$,\1,"`
>+ if test "x$LIBTOOL_M4" != "x"; then
>+  rm -f aclocal.m4
>+  cp $LIBTOOL_M4 aclocal.m4
>+ fi
>+-libtoolize --copy --force || exit 1
>++libtoolize13 --copy --force || exit 1
>+ 
>+ echo "Running autoconf ..."
>+ autoconf || exit 1
>Index: files/patch-builds::original::boot.sfx.interbase
>===================================================================
>RCS file: files/patch-builds::original::boot.sfx.interbase
>diff -N files/patch-builds::original::boot.sfx.interbase
>--- files/patch-builds::original::boot.sfx.interbase	16 Jan 2003 11:52:00 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,29 +0,0 @@
>---- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
>-+++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
>-@@ -70,7 +70,7 @@
>- #added completed according to inprise tree
>- #FSG  093000
>- 
>--firebird:	gds.h includes fireboot run_codes executables help msgs msgs_intl extlib examples completed
>-+firebird:	gds.h includes fireboot run_codes executables help msgs msgs_intl extlib completed
>- 
>- #  burp wanted to build gpre	
>- #  we break this dependency
>-@@ -169,7 +169,7 @@
>- 	$(SUPER_SERVER)  qli remote spit utilities \
>- 	$(SHARED_AM) $(LINKABLE_LIBS)
>- 
>--super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
>-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
>- 
>- super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
>- 
>-@@ -199,7 +199,7 @@
>- 
>- super_client:		force
>- 	$(QUIET_ECHO) "Building super/client..."
>--	$(SH) '$(CD) source/super/client; $(MAKE) CFLAGS="$(CFLAGS) -DSUPERCLIENT" SYSTEM="$(SYSTEM)" super_client'
>-+	$(SH) '$(CD) source/super/client; $(MAKE) SYSTEM="$(SYSTEM)" super_client'
>- 
>- csu gcsu:	$(ACCESS_METHOD) force
>- 	$(QUIET_ECHO) "Building GCSU..."
>Index: files/patch-builds::original::edit_make
>===================================================================
>RCS file: files/patch-builds::original::edit_make
>diff -N files/patch-builds::original::edit_make
>--- files/patch-builds::original::edit_make	11 Nov 2002 17:23:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>---- builds/original/edit_make.orig	Fri Aug  4 06:42:41 2000
>-+++ builds/original/edit_make	Sat Nov  9 16:06:59 2002
>-@@ -16,13 +16,25 @@
>- # Contributor(s): ______________________________________.
>- if [ "$SYS_TYPE" != "NOLINK_OS" -a "$1" != "WIN_NT" -a "$1" != "OS2" -a $1 != 'WIN_NTS' ]; then
>-     if [ "$3" = "make.client" ]; then
>--    sed -e "s/\$(SUPER_FLAG)/-DSUPERCLIENT/g" \
>--        -e "s/\$(SYSTEM)/$1/g" \
>--        -e "s/\$(VERSION)/$2/g" \
>--        -e "s?\$(DB_DIR)?$DB_DIR?g" $3 > $4
>-+        if [ "$FBBUILDHACK" = "FREEBSD" ]; then
>-+            sed -e "s/\$(SUPER_FLAG)/-DSUPERCLIENT -D_REENTRANT -D_THREAD_SAFE/g" \
>-+                -e "s/\$(SYSTEM)/$1/g" \
>-+                -e "s/\$(VERSION)/$2/g" \
>-+                -e "s?\$(DB_DIR)?$DB_DIR?g" $3 > $4
>-+        else
>-+            sed -e "s/\$(SUPER_FLAG)/-DSUPERCLIENT/g" \
>-+                -e "s/\$(SYSTEM)/$1/g" \
>-+                -e "s/\$(VERSION)/$2/g" \
>-+                -e "s?\$(DB_DIR)?$DB_DIR?g" $3 > $4
>-+        fi
>-     elif [ "$3" = "make.dsql_ss" -o "$3" = "make.intl_ss" -o "$3" = "make.journal_ss" -o "$3" = "make.jrd_ss" -o "$3" = "make.lock_ss" -o "$3" = "make.remote_ss" -o "$3" = "make.wal_ss" -o "$3" = "make.burp_ss" -o "$3" = "make.alice_ss" -o "$3" = "make.utilities_ss" ]; then
>-     	if [ "$1" = "HP10" -o "$1" = "LINUX" ]; then
>-             sed -e "s/\$(SUPER_FLAG)/-DSUPERSERVER -D_REENTRANT/g" \
>-+                -e "s/\$(SYSTEM)/$1/g" \
>-+                -e "s/\$(VERSION)/$2/g" \
>-+                -e "s?\$(DB_DIR)?$DB_DIR?g" $3 > $4
>-+    	elif [ "$FBBUILDHACK" = "FREEBSD" ]; then
>-+            sed -e "s/\$(SUPER_FLAG)/-DSUPERSERVER -D_REENTRANT -D_THREAD_SAFE/g" \
>-                 -e "s/\$(SYSTEM)/$1/g" \
>-                 -e "s/\$(VERSION)/$2/g" \
>-                 -e "s?\$(DB_DIR)?$DB_DIR?g" $3 > $4
>Index: files/patch-builds::original::platform
>===================================================================
>RCS file: files/patch-builds::original::platform
>diff -N files/patch-builds::original::platform
>--- files/patch-builds::original::platform	11 Nov 2002 17:23:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>---- builds/original/platform.orig	Sun Sep 16 22:15:14 2001
>-+++ builds/original/platform	Sat Nov  9 16:16:23 2002
>-@@ -32,6 +32,10 @@
>-     SYS_TYPE=GENERIC
>- fi
>- export SYS_TYPE
>-+if [ $1 = 'FREEBSD' ]; then
>-+    FBBUILDHACK=$1
>-+    export FBBUILDHACK
>-+fi
>- #
>- if [ $1 = 'SUN3_4' -o $1 = 'SUN4' -o $1 = 'AP' -o $1 = 'AX' ]; then
>-     TR='tr "A-Z" "a-z"'
>Index: files/patch-builds::original::prefix.freebsd
>===================================================================
>RCS file: files/patch-builds::original::prefix.freebsd
>diff -N files/patch-builds::original::prefix.freebsd
>--- files/patch-builds::original::prefix.freebsd	16 Jan 2003 11:52:00 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
>-+++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
>-@@ -30,7 +30,7 @@
>- PROD_DEBUG_OBJECTS=	nodebug.o
>- PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
>- PROD_VERSION_FLAG=	-DPROD_BUILD
>--PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
>-+PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
>- 
>- 
>- DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o

Actions: View | Diff

Attachments on bug 58999: 36931