Attachment 20382 Details for Bug 35982 – file.diff

[patch] file.diff

file.diff (text/plain), 13.10 KB, created by Chris Knight on 2002-03-16 16:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Knight

Created: 2002-03-16 16:20:02 UTC

Size: 13.10 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	29 Jan 2002 09:45:00 -0000	1.7
>+++ Makefile	16 Mar 2002 00:48:30 -0000
>@@ -6,19 +6,20 @@
> #
> 
> PORTNAME=	firebird
>-PORTVERSION=	0.9
>-PORTREVISION=	4
>+PORTVERSION=	1.0
> CATEGORIES=	databases
> MASTER_SITES=	http://firebird.sourceforge.net/download/ \
>+		http://www.aims.com.au/chris/ \
> 		${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=firebird
>-DISTFILES=	firebird-boot-kit.tar.gz \
>+DISTFILES=	bootkit-1.0.0.796.tar.gz \
>+		bootkit-freebsd-1.0.0.796.tar.gz \
> 		interbase0.9-4-v5examples.tar.gz \
>-		interbase0.9-4src.tar.gz
>+		Firebird-1.0.0.796.src.tar.gz
> 
> MAINTAINER=	chris@aims.com.au
> 
>-WRKSRC=		${WRKDIR}/interbase
>+WRKSRC=		${WRKDIR}/firebird-1.0.0.796
> INSTALLS_SHLIB=	yes
> LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
> MSG_FILE=	${PKGDIR}/pkg-message
>@@ -31,9 +32,12 @@
> do-extract:
> 	@${MKDIR} ${WRKDIR}
> 	@(								\
>-	cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
>-	cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
>-	${CP} msgs/msg.gbak misc/msg.gbak				\
>+	cd ${WRKDIR}; ${TAR} -zxf					\
>+		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
>+	cd firebird-1.0.0.796;						\
>+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
>+	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
>+	${CP} -f msgs/msg.gbak misc/msg.gbak				\
> 	)
> 
> post-patch:
>@@ -47,11 +51,17 @@
> 
> do-configure:
> 	@(								\
>-	cd ${WRKDIR}/interbase;						\
>-	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
>+	cd ${WRKDIR}/firebird-1.0.0.796;				\
>+	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
> 	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
> 	${SH} buildBootDatabases;					\
>-	${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot;	\
>+	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
>+	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
>+	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
>+		> builds_win32/original/build_no.ksh.fix;		\
>+	${MV} -f builds_win32/original/build_no.ksh.fix			\
>+		 builds_win32/original/build_no.ksh;			\
>+	${SH} Configure.sh PROD FREEBSD;				\
> 	)
> 
> do-build:
>@@ -60,15 +70,21 @@
> 	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
> 	) > ${WRKDIR}/000.${PORTNAME}.sh
> 	@(								\
>-	cd ${WRKDIR}/interbase;						\
>-	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
>+	${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb			\
>+		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
>+	${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb			\
>+		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
>+	cd ${WRKDIR}/firebird-1.0.0.796;				\
>+	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
> 	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
> 	${SH} boot.freebsd;						\
> 	)
> 
> do-install:
> 	@(								\
>-	cd ${WRKDIR}/interbase;						\
>+	cd ${WRKDIR}/firebird-1.0.0.796;				\
>+	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb;	\
>+	${CP} /dev/null interbase/interbase.log;			\
> 	${CP} -Rp interbase ${PREFIX}/firebird;				\
> 	${RM} ${PREFIX}/firebird/install;				\
> 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	10 Mar 2001 20:32:33 -0000	1.1
>+++ distinfo	16 Mar 2002 00:20:07 -0000
>@@ -1,3 +1,4 @@
>-MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64
>+MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
>+MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
> MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
>-MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652
>+MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/pkg-descr,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-descr
>--- pkg-descr	2 Dec 2001 17:53:06 -0000	1.2
>+++ pkg-descr	13 Mar 2002 06:56:23 -0000
>@@ -10,13 +10,12 @@
> been closed.
> 
> 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/
>-
>-and of course the firebird page itself:
>-WWW: http://sourceforge.net/projects/firebird/
> 
> For more information on the locksmith back door, see:
> 
>Index: pkg-install
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/pkg-install,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-install
>--- pkg-install	2 Dec 2001 17:53:06 -0000	1.3
>+++ pkg-install	13 Mar 2002 06:57:48 -0000
>@@ -29,7 +29,7 @@
> if( \$> ) {
> 	print "\nYou must be root to run this step!\n\n";
> 	exit 1;
>-} 
>+}
> 
> if( getpwnam( "firebird" ) ) {
> 	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
>@@ -78,7 +78,7 @@
> 
> # Now fix up the mess.
> 
>-# fix up directories 
>+# fix up directories
> for i in `find $PKG_PREFIX/firebird -print`
>   do
>     FileName=$i
>@@ -99,7 +99,7 @@
> cd $PKG_PREFIX/firebird/bin
> 
> # all users can run everything.
>-chmod o=rx * 
>+chmod o=rx *
> 
> # SUID is needed for running server programs.
> 
>@@ -113,7 +113,7 @@
> 
> cd $PKG_PREFIX/firebird
> 
>-for i in isc_init1 isc_lock1 isc_event1 
>+for i in isc_init1 isc_lock1 isc_event1
>   do
>     FileName=$i.`hostname`
>     touch $FileName
>Index: files/RELNOTES
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/files/RELNOTES,v
>retrieving revision 1.2
>diff -u -r1.2 RELNOTES
>--- files/RELNOTES	2 Dec 2001 17:53:09 -0000	1.2
>+++ files/RELNOTES	16 Mar 2002 00:19:18 -0000
>@@ -1,6 +1,6 @@
>-Firebird 0.9_4 FreeBSD Release Notes                       13-Jan-2001
>-------------------------------------
>-FB-T0.9.4.34 Firebird Test1
>+Firebird 1.0.0 FreeBSD Release Notes                    13-Mar-2002
>+--------------------------------------
>+FB-T6.2.796 Firebird Final Release
> 
> Welcome to the FreeBSD Firebird port!  Users should note that there
> was a package called `firebird-1.0.tgz' released in mid-August
>@@ -75,5 +75,5 @@
> 	http://www.interbase2000.org/
> 	http://www.firebirdsql.org/
> 
>-Geoff Speicher
>-<geoff@sea-incorporated.com>
>+Chris Knight
>+<chris@aims.com.au>
>Index: files/patch-aa
>===================================================================
>RCS file: files/patch-aa
>diff -N files/patch-aa
>--- files/patch-aa	10 Mar 2001 20:32:33 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- buildBootDatabases.orig	Tue Oct 10 23:00:39 2000
>-+++ buildBootDatabases	Tue Oct 10 23:00:46 2000
>-@@ -49,7 +49,7 @@
>-     DefaultAns=$2
>-     echo -n "${1}"
>-     Answer="$DefaultAns"
>--    read Answer
>-+#    read Answer
>- }
>- 
>- #--------------------------------------------------------------------
>Index: files/patch-ab
>===================================================================
>RCS file: files/patch-ab
>diff -N files/patch-ab
>--- files/patch-ab	10 Mar 2001 20:32:33 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- setup_dirs.boot.orig	Tue Oct 10 23:00:07 2000
>-+++ setup_dirs.boot	Tue Oct 10 23:00:22 2000
>-@@ -49,7 +49,7 @@
>-    DefaultAns=$2
>-    echo -n "${1}"
>-    Answer="$DefaultAns"
>--   read Answer 
>-+#   read Answer 
>- }
>- 
>- 
>Index: files/patch-ac
>===================================================================
>RCS file: files/patch-ac
>diff -N files/patch-ac
>--- files/patch-ac	10 Mar 2001 20:32:33 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,58 +0,0 @@
>---- builds/original/prefix.freebsd	2000/10/08 15:36:25	1.2
>-+++ builds/original/prefix.freebsd	2001/01/11 19:17:58
>-@@ -28,7 +28,7 @@
>- 
>- 
>- PROD_DEBUG_OBJECTS=	nodebug.o
>--PROD_SHRLIB_DIR=	
>-+PROD_SHRLIB_DIR=	-Lsource/jrd
>- PROD_VERSION_FLAG=	-DPROD_BUILD
>- PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
>- 
>-@@ -48,7 +48,7 @@
>- UDF_LINK_CMD=		gcc
>- UDF_CFLAGS=         	-fPIC -mieee-fp
>- UDF_LFLAGS=         	-shared
>--UDF_SHRLIBS=        	-L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt
>-+UDF_SHRLIBS=        	$(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt
>- 
>- #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
>- #      to workaround the Solaris threading problems with signals
>-@@ -69,16 +69,14 @@
>- FUNCTIONS=		functions.bin
>- FUNCSHR=		source/interbase/lib/gdsf.so
>- GDS_LINK=		$(GDSSHR_LINK)
>--#GDS_PYXIS=
>- GDS_PYXIS=		gds_pyxis.a
>- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
>- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
>- 
>- GDSSHR=			source/interbase/lib/gds.so
>- LINUX_GDSSHR=		$(GDSSHR)
>--GDSSHR_LINK=		$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt
>--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis
>--#PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
>-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
>-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
>- HLPDIR=			source/qli/
>- HOSTNAME=		`hostname | cut -d'.' -f1`
>- INCLUDES=		include_so include_so_ada	
>-@@ -106,11 +104,6 @@
>- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
>- PIC_FLAGS=		$(CFLAGS) -fPIC
>- PIPE=			gds.a gds_pipe
>--#PYXIS=
>--#PYXIS_MISC_OBJS=
>--#PYXIS_P_MISC_OBJS=
>--#PYXIS_OBJECTS=
>--#PYXIS_MISC_OBJECTS=
>- PYXIS=			pyxis
>- PYXIS_MISC_OBJS=	$(PYXIS_MISC)
>- PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
>-@@ -167,5 +160,8 @@
>- SHRLIB_EXT=		.so
>- 
>- V3PRINTER=		source/lock/printv3.o
>-+
>-+# Forces library build for FreeBSD
>-+PYXIS_LIBRARY= libpyxis.a
>Index: files/patch-ad
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/files/patch-ad,v
>retrieving revision 1.1
>diff -u -r1.1 patch-ad
>--- files/patch-ad	2 Dec 2001 17:53:09 -0000	1.1
>+++ files/patch-ad	13 Mar 2002 07:00:51 -0000
>@@ -1,13 +1,12 @@
>---- 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);
>+--- setup_dirs.orig	Tue Aug  7 05:00:12 2001
>++++ setup_dirs	Fri Dec 28 16:12:49 2001
>+@@ -60,7 +60,8 @@
>+     DefaultAns=$2
>+     echo -n "${1}"
>+     Answer="$DefaultAns"
>+-    read Answer 
>++#    read Answer 
>++    echo ""
>  }
>- #endif
>+ 
>+ 
>Index: files/patch-ae
>===================================================================
>RCS file: files/patch-ae
>diff -N files/patch-ae
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-ae	13 Mar 2002 07:00:51 -0000
>@@ -0,0 +1,10 @@
>+--- jrd/common.h.orig	Sat Nov 17 20:07:00 2001
>++++ jrd/common.h	Sun Nov 18 18:54:26 2001
>+@@ -137,6 +137,7 @@
>+ /* FreeBSD for Intel platforms */
>+ #ifdef FREEBSD
>+
>++#define UNIX_64_BIT_IO
>+ #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
>+ #define ALIGNMENT     4
>+ #define DOUBLE_ALIGN  4
>Index: files/patch-af
>===================================================================
>RCS file: files/patch-af
>diff -N files/patch-af
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-af	13 Mar 2002 07:00:51 -0000
>@@ -0,0 +1,13 @@
>+--- 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
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-ag	13 Mar 2002 07:00:51 -0000
>@@ -0,0 +1,11 @@
>+--- 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: scripts/createuser
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/scripts/createuser,v
>retrieving revision 1.1
>diff -u -r1.1 createuser
>--- scripts/createuser	10 Mar 2001 20:32:33 -0000	1.1
>+++ scripts/createuser	13 Mar 2002 07:02:37 -0000
>@@ -8,7 +8,7 @@
> if( $> ) {
> 	print "\nYou must be root to run this step!\n\n";
> 	exit 1;
>-} 
>+}
> 
> if( getpwnam( "firebird" ) ) {
> 	( $null, $null, $fbUID ) = getpwnam( "firebird" );
>Index: scripts/post-install
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/scripts/post-install,v
>retrieving revision 1.2
>diff -u -r1.2 post-install
>--- scripts/post-install	2 Dec 2001 17:53:14 -0000	1.2
>+++ scripts/post-install	13 Mar 2002 07:03:02 -0000
>@@ -7,7 +7,7 @@
> 
> # Now fix up the mess.
> 
>-# fix up directories 
>+# fix up directories
> for i in `find $PREFIX/firebird -print`
>   do
>     FileName=$i
>@@ -28,7 +28,7 @@
> cd $PREFIX/firebird/bin
> 
> # all users can run everything.
>-chmod o=rx * 
>+chmod o=rx *
> 
> # SUID is needed for running server programs.
> 
>@@ -42,7 +42,7 @@
> 
> cd $PREFIX/firebird
> 
>-for i in isc_init1 isc_lock1 isc_event1 
>+for i in isc_init1 isc_lock1 isc_event1
>   do
>     FileName=$i.`hostname`
>     touch $FileName

Actions: View | Diff

Attachments on bug 35982: 20382