From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../firebird-2.5.1.26351.0-superclassic.patch | 12 +++++ .../files/firebird-2.5.3.26780.0-deps-flags.patch | 59 ++++++++++++++++++++++ .../firebird-3.0.2.32703.0-cloop-compiler.patch | 15 ++++++ .../files/firebird-3.0.2.32703.0-gcc6.patch | 19 +++++++ .../files/firebird-3.0.2.32703.0-unbundle.patch | 51 +++++++++++++++++++ dev-db/firebird/files/firebird.conf.d.2.5 | 7 +++ dev-db/firebird/files/firebird.init.d.2.5 | 30 +++++++++++ dev-db/firebird/files/firebird.init.d.3.0 | 22 ++++++++ dev-db/firebird/files/firebird.logrotate | 10 ++++ dev-db/firebird/files/firebird.xinetd | 11 ++++ dev-db/firebird/files/firebird.xinetd.3.0 | 11 ++++ 11 files changed, 247 insertions(+) create mode 100644 dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch create mode 100644 dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch create mode 100644 dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch create mode 100644 dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch create mode 100644 dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch create mode 100644 dev-db/firebird/files/firebird.conf.d.2.5 create mode 100644 dev-db/firebird/files/firebird.init.d.2.5 create mode 100644 dev-db/firebird/files/firebird.init.d.3.0 create mode 100644 dev-db/firebird/files/firebird.logrotate create mode 100644 dev-db/firebird/files/firebird.xinetd create mode 100644 dev-db/firebird/files/firebird.xinetd.3.0 (limited to 'dev-db/firebird/files') diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch new file mode 100644 index 000000000000..3891cc776fae --- /dev/null +++ b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch @@ -0,0 +1,12 @@ +diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird +--- orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 ++++ builds/posix/Makefile.in.firebird 2011-03-07 20:26:56.612573632 -0500 +@@ -332,7 +332,7 @@ + .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql + .PHONY: embed_gpre embed_util + +-classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \ ++classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \ + embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET) + + libfbembed: diff --git a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch new file mode 100644 index 000000000000..506a6c07a79c --- /dev/null +++ b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch @@ -0,0 +1,59 @@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird +--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400 +@@ -158,7 +158,7 @@ + # some complications particularly for super in needing to start the server + # that you are currently building. MOD 28-July-2002 + +-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets ++firebird_basic: firebird_boot basic_targets + + firebird_boot: updateBuildNum boot_phase1 boot_phase2 + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults +--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400 +@@ -138,7 +138,7 @@ + AR= ar @AR_OPTIONS@ crsu + LN= @LN_S@ + RANLIB= @RANLIB@ +-BTYACC=$(ROOT)/extern/btyacc/btyacc ++BTYACC=/usr/bin/btyacc + + CC = @CC@ + CXX = @CXX@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400 +@@ -18,11 +18,10 @@ + # + # 2 Oct 2002, Nickolay Samofatov - Major cleanup + +-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 +-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer ++COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400 +@@ -18,12 +18,11 @@ + # + # 2 Oct 2002, Nickolay Samofatov - Major cleanup + +-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 +-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer ++COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + CXXFLAGS:= $(CXXFLAGS) -fno-rtti + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) + diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch new file mode 100644 index 000000000000..363602bed8f4 --- /dev/null +++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch @@ -0,0 +1,15 @@ +Source: LibreOffice git master + + +diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile +--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200 ++++ firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200 +@@ -4,8 +4,6 @@ + + TARGET := release + +-CC := gcc +-CXX := g++ + LD := $(CXX) + + SRC_DIR := src diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch new file mode 100644 index 000000000000..e1361415c03b --- /dev/null +++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch @@ -0,0 +1,19 @@ +commit 3618aa2171674babf79ef935aa049c40a3db1321 +Author: asfernandes +Date: Sat Mar 5 03:39:36 2016 +0000 + + Make the generated code compatible with gcc 6 in C++-14 mode. + +diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp +index 2af96c6..2dcffd6 100644 +--- a/src/gpre/c_cxx.cpp ++++ b/src/gpre/c_cxx.cpp +@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request) + printa(0, "static %sshort\n isc_%dl = %d;", + (request->req_flags & REQ_extend_dpb) ? "" : CONST_STR, + request->req_ident, request->req_length); +- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident); ++ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident); + + const TEXT* string_type = "blr"; + if (gpreGlob.sw_raw) diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch new file mode 100644 index 000000000000..6fdd657223d4 --- /dev/null +++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch @@ -0,0 +1,51 @@ +diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in Firebird-3.0.2.32703-0/builds/posix/Makefile.in +--- Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in 2017-03-21 10:11:35.000000000 +0100 ++++ Firebird-3.0.2.32703-0/builds/posix/Makefile.in 2017-05-14 01:32:34.032241679 +0200 +@@ -123,7 +123,6 @@ + # + + extern: +- $(MAKE) -C $(ROOT)/extern/btyacc + $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop + + ifeq ($(TOMBUILD_FLG),Y) +@@ -648,7 +647,7 @@ + # various cleaning + # + .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \ +- clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \ ++ clean_gpre_gen clean_dbs clean_examples clean_makefiles \ + clean_editline clean_all + + +@@ -669,8 +668,6 @@ + $(RM) $(ROOT)/libtool + $(RM_R) $(ROOT)/autom4te.cache + -$(MAKE) -C $(ROOT)/extern/editline distclean +-# -$(MAKE) -C $(ROOT)/extern/icu/source distclean +- -$(MAKE) -C $(ROOT)/extern/btyacc distclean + + clean_dbs: + $(RM) *.fdb *.FDB msg.timestamp +@@ -687,9 +684,6 @@ + clean_editline: + -$(MAKE) -C $(ROOT)/extern/editline clean + +-#clean_icu: +-# -$(MAKE) -C $(ROOT)/extern/icu/source clean +- + clean_tommath: + -$(MAKE) -C $(ROOT)/extern/libtommath clean + +diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults Firebird-3.0.2.32703-0/builds/posix/make.defaults +--- Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults 2017-03-21 10:11:35.000000000 +0100 ++++ Firebird-3.0.2.32703-0/builds/posix/make.defaults 2017-05-14 01:29:54.590235045 +0200 +@@ -155,7 +155,7 @@ + AR= ar @AR_OPTIONS@ + LN= @LN_S@ + RANLIB= @RANLIB@ +-BTYACC=$(ROOT)/extern/btyacc/btyacc ++BTYACC=/usr/bin/btyacc + CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/release/bin/cloop + + CC = @CC@ diff --git a/dev-db/firebird/files/firebird.conf.d.2.5 b/dev-db/firebird/files/firebird.conf.d.2.5 new file mode 100644 index 000000000000..625963d0c13b --- /dev/null +++ b/dev-db/firebird/files/firebird.conf.d.2.5 @@ -0,0 +1,7 @@ +FBUSER=firebird +FBGROUP=firebird +FIREBIRD=/usr/lib/firebird +FBGUARD=/usr/sbin/fbguard +PIDFILE=/var/run/firebird/firebird.pid +FB_OPTS="-forever -daemon -pidfile $PIDFILE" +LD_LIBRARY_PATH=/usr/lib/:/usr/lib/firebird/intl/:/usr/lib/firebird/plugins/:/usr/lib/firebird/UDF/ diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5 new file mode 100644 index 000000000000..9c9bfb92d601 --- /dev/null +++ b/dev-db/firebird/files/firebird.init.d.2.5 @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +start_pre() { + checkpath -d -o $FBUSER "$(dirname $PIDFILE)" +} + +start(){ + ebegin "Starting Firebird server" + start-stop-daemon --start --pidfile $PIDFILE --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS + eend $? +} + +stop(){ + ebegin "Stopping Firebird server" + start-stop-daemon --stop --name fbguard + eend $? +} + +restart(){ + svc_stop + sleep 1 + svc_start +} + diff --git a/dev-db/firebird/files/firebird.init.d.3.0 b/dev-db/firebird/files/firebird.init.d.3.0 new file mode 100644 index 000000000000..9fd4f8504769 --- /dev/null +++ b/dev-db/firebird/files/firebird.init.d.3.0 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +name=${RC_SVCNAME} + +fbhomedir="/var/run/firebird" +fblogdir="/var/log/firebird" +pidfile="${fbhomedir}/firebird.pid" +command="/usr/sbin/fbguard" +command_args="-forever -daemon -pidfile $pidfile" + +start_stop_daemon_args="-p ${pidfile} -u ${FBUSER:-firebird}:${FBGROUP:-firebird}" + +depend() { + need net +} + +start_pre() { + checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} ${fbhomedir} || return 1 + checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} ${fblogdir} || return 1 +} diff --git a/dev-db/firebird/files/firebird.logrotate b/dev-db/firebird/files/firebird.logrotate new file mode 100644 index 000000000000..c87cd43f30f8 --- /dev/null +++ b/dev-db/firebird/files/firebird.logrotate @@ -0,0 +1,10 @@ +/var/log/firebird/firebird.log { + compress + weekly + missingok + rotate 52 + size=+1024k + delaycompress + notifempty + create 644 firebird + } diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd new file mode 100644 index 000000000000..01fc102ee3a8 --- /dev/null +++ b/dev-db/firebird/files/firebird.xinetd @@ -0,0 +1,11 @@ +service gds_db +{ + flags = REUSE + socket_type = stream + wait = no + user = firebird + log_on_success += USERID + log_on_failure += USERID + server = /usr/bin/fb_inet_server + disable = yes +} diff --git a/dev-db/firebird/files/firebird.xinetd.3.0 b/dev-db/firebird/files/firebird.xinetd.3.0 new file mode 100644 index 000000000000..4e094bdf0627 --- /dev/null +++ b/dev-db/firebird/files/firebird.xinetd.3.0 @@ -0,0 +1,11 @@ +service gds_db +{ + flags = REUSE + socket_type = stream + wait = no + user = firebird + log_on_success += USERID + log_on_failure += USERID + server = /usr/bin/firebird + disable = yes +} -- cgit v1.2.3