[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Patrice Clement]

commit:     7308dd669a4bd377618684e8bf65c2b2ee09f82f
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Thu Sep 17 22:26:50 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 22:26:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7308dd66

dev-db/firebird: Correcting file permissions of logrotate file, fixes bug# 547442

 dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild | 287 +++++++++++++++++++++++
 1 file changed, 287 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
new file mode 100644
index 0000000..281bae6
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/"
+SRC_URI="
+	mirror://sourceforge/firebird/${MY_P}.tar.bz2
+	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 -ia64 ~x86"
+
+IUSE="doc client superserver xinetd examples debug"
+REQUIRED_USE="
+	client? ( !superserver )
+	client? ( !xinetd )
+	superserver? ( !xinetd )
+"
+
+CDEPEND="
+	dev-libs/libedit
+	dev-libs/icu:=
+"
+DEPEND="${CDEPEND}
+	>=dev-util/btyacc-3.0-r2
+	doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+}
+
+function check_sed() {
+	MSG="sed of $3, required $2 lines modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use doc; then
+		# Unpack docs
+		mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
+		unpack ib_b60_doc.zip
+	fi
+}
+
+src_prepare() {
+	# This patch might be portable, and not need to be duplicated per version
+	# also might no longer be necessary to patch deps or libs, just flags
+	epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+
+	use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+	use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+	# Rename references to isql to fbsql
+	# sed vs patch for portability and addtional location changes
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
+	rm -rf "${S}"/extern/{btyacc,editline,icu} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf \
+		--prefix=/usr/$(get_libdir)/firebird \
+		$(use_enable superserver superserver) \
+		$(use_enable debug) \
+		--with-editline \
+		--with-system-editline \
+		--with-system-icu \
+		--with-fbbin=/usr/bin \
+		--with-fbsbin=/usr/sbin \
+		--with-fbconf=/etc/${PN} \
+		--with-fblib=/usr/$(get_libdir) \
+		--with-fbinclude=/usr/include \
+		--with-fbdoc=/usr/share/doc/${P} \
+		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+		--with-fbsample=/usr/share/doc/${P}/examples \
+		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
+		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+		--with-fbmisc=/usr/share/${PN} \
+		--with-fbsecure-db=/etc/${PN} \
+		--with-fbmsg=/usr/$(get_libdir)/${PN} \
+		--with-fblog=/var/log/${PN}/ \
+		--with-fbglock=/var/run/${PN} \
+		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+		--with-gnu-ld \
+		${myconf}
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
+	emake
+}
+
+src_install() {
+	cd "${S}/gen/${PN}" || die
+
+	if use doc; then
+		dodoc "${S}"/doc/*.pdf
+		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+	fi
+
+	doheader include/*
+
+	rm lib/libfbstatic.a
+
+	insinto /usr/$(get_libdir)
+	dolib.so lib/*.so*
+
+	# links for backwards compatibility
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.msg
+
+	use client && return
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql
+
+	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+	for bin in ${bins[@]}; do
+		dobin bin/${bin}
+	done
+
+	dosbin bin/fb_lock_print
+	# SuperServer
+	if use superserver ; then
+		dosbin bin/{fbguard,fbserver}
+	# ClassicServer
+	elif use xinetd ; then
+		dosbin bin/fb_inet_server
+	# SuperClassic
+	else
+		dosbin bin/{fbguard,fb_smp_server}
+
+		#Temp should not be necessary, need to patch/fix
+		dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+	fi
+
+	exeinto /usr/bin/${PN}
+	exeopts -m0755
+	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+	insinto /usr/$(get_libdir)/${PN}/help
+	doins help/help.fdb
+
+	exeinto /usr/$(get_libdir)/firebird/intl
+	dolib.so intl/libfbintl.so
+	dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+	exeinto /usr/$(get_libdir)/${PN}/plugins
+	dolib.so plugins/libfbtrace.so
+	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+
+	exeinto /usr/$(get_libdir)/${PN}/UDF
+	doexe UDF/*.so
+
+	insinto /usr/share/${PN}/upgrade
+	doins "${S}"/src/misc/upgrade/v2/*
+
+	insinto /etc/${PN}
+	insopts -m0644 -o firebird -g firebird
+	doins ../install/misc/*.conf
+	insopts -m0660 -o firebird -g firebird
+	doins security2.fdb
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+		fperms 640 /etc/conf.d/${PN}
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+	fperms 0644 /etc/logrotate.d/${PN}
+
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/${PN}
+	dodir /var/run/${PN}
+	keepdir /var/log/${PN}
+	keepdir /var/run/${PN}
+
+	use examples && docinto examples
+}
+
+pkg_postinst() {
+	use client && return
+
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+	chmod 750 "${ROOT}/etc/${PN}"
+}
+
+pkg_config() {
+	use client && return
+
+	# if found /etc/security.gdb from previous install, backup, and restore as
+	# /etc/security2.fdb
+	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
+		# if we have scurity2.fdb already, back it 1st
+		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
+			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
+		fi
+		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
+		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
+		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
+		rm "${ROOT}/etc/firebird/security.gbk"
+
+		# make sure they are readable only to firebird
+		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
+		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
+
+		echo
+		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+		echo
+	fi
+
+	# we need to enable local access to the server
+	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
+		touch "${ROOT}/etc/hosts.equiv"
+		chown root:0 "${ROOT}/etc/hosts.equiv"
+		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost.localdomain' to the hosts.equiv file...
+	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost' to the hosts.equiv file...
+	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	HS_NAME=`hostname`
+	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /usr/lib/firebird/UDF"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Patrice Clement]

commit:     930cf1f8cfdc999dcd745665615bc8557c45edcf
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Wed Sep 23 01:00:50 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 01:00:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930cf1f8

dev-db/firebird: removed ebuild omitted in previous commit

 dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild | 286 -----------------------
 1 file changed, 286 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
deleted file mode 100644
index 9fe14f6..0000000
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="
-	mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-
-IUSE="doc client superserver xinetd examples debug"
-REQUIRED_USE="
-	client? ( !superserver )
-	client? ( !xinetd )
-	superserver? ( !xinetd )
-"
-
-CDEPEND="
-	dev-libs/libedit
-	dev-libs/icu:=
-"
-DEPEND="${CDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-RESTRICT="userpriv"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	unpack "${MY_P}.tar.bz2"
-	if use doc; then
-		# Unpack docs
-		mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
-		unpack ib_b60_doc.zip
-	fi
-}
-
-src_prepare() {
-	# This patch might be portable, and not need to be duplicated per version
-	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
-
-	use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
-	use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
-	rm -rf "${S}"/extern/{btyacc,editline,icu} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver superserver) \
-		$(use_enable debug) \
-		--with-editline \
-		--with-system-editline \
-		--with-system-icu \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${P} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${P}/examples \
-		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-	emake
-}
-
-src_install() {
-	cd "${S}/gen/${PN}" || die
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	doheader include/*
-
-	rm lib/libfbstatic.a
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.msg
-
-	use client && return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins[@]}; do
-		dobin bin/${bin}
-	done
-
-	dosbin bin/fb_lock_print
-	# SuperServer
-	if use superserver ; then
-		dosbin bin/{fbguard,fbserver}
-	# ClassicServer
-	elif use xinetd ; then
-		dosbin bin/fb_inet_server
-	# SuperClassic
-	else
-		dosbin bin/{fbguard,fb_smp_server}
-
-		#Temp should not be necessary, need to patch/fix
-		dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
-	fi
-
-	exeinto /usr/bin/${PN}
-	exeopts -m0755
-	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /usr/$(get_libdir)/${PN}/help
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	dolib.so intl/libfbintl.so
-	dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/${PN}
-	insopts -m0644 -o firebird -g firebird
-	doins ../install/misc/*.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	dodir /var/run/${PN}
-	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	use client && return
-
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-}
-
-pkg_config() {
-	use client && return
-
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		echo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		echo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Michał Górny]

commit:     9b00135f4696e539a3cbee711ac687f4f9ded105
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Sun Oct  4 21:44:18 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 16:53:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b00135f

dev-db/firebird: Various syntax improvements and fixes

With second batch of fixes by Michał Górny.

Pull-Request: https://github.com/gentoo/gentoo/pull/154

 ...-r2.ebuild => firebird-2.5.3.26780.0-r3.ebuild} | 83 +++++++++++-----------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
similarity index 76%
rename from dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
rename to dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
index 281bae6..6b824a6 100644
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
+inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
 #MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
@@ -13,18 +13,14 @@ DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008
 HOMEPAGE="http://www.firebirdsql.org/"
 SRC_URI="
 	mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+	doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="doc client superserver xinetd examples debug"
-REQUIRED_USE="
-	client? ( !superserver )
-	client? ( !xinetd )
-	superserver? ( !xinetd )
-"
+IUSE="debug doc client examples superserver xinetd"
+REQUIRED_USE="^^ ( client superserver xinetd )"
 
 CDEPEND="
 	dev-libs/libedit
@@ -45,10 +41,10 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
 }
 
-function check_sed() {
+check_sed() {
 	MSG="sed of $3, required $2 lines modified $1"
 	einfo "${MSG}"
 	[[ $1 -ge $2 ]] || die "${MSG}"
@@ -58,7 +54,8 @@ src_unpack() {
 	unpack "${MY_P}.tar.bz2"
 	if use doc; then
 		# Unpack docs
-		mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
+		mkdir "manuals" || die
+		cd "manuals" || die
 		unpack ib_b60_doc.zip
 	fi
 }
@@ -82,8 +79,8 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
-	rm -rf "${S}"/extern/{btyacc,editline,icu} || die
+	find "${S}" -name \*.sh -exec chmod +x {} + || die
+	rm -r "${S}"/extern/{btyacc,editline,icu} || die
 
 	eautoreconf
 }
@@ -94,7 +91,7 @@ src_configure() {
 
 	econf \
 		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver superserver) \
+		$(use_enable superserver) \
 		$(use_enable debug) \
 		--with-editline \
 		--with-system-editline \
@@ -126,7 +123,7 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}/gen/${PN}" || die
+	cd "gen/${PN}" || die
 
 	if use doc; then
 		dodoc "${S}"/doc/*.pdf
@@ -135,7 +132,7 @@ src_install() {
 
 	doheader include/*
 
-	rm lib/libfbstatic.a
+	rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
 
 	insinto /usr/$(get_libdir)
 	dolib.so lib/*.so*
@@ -151,10 +148,10 @@ src_install() {
 	use client && return
 
 	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
+	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
 
 	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins[@]}; do
+	for bin in ${bins}; do
 		dobin bin/${bin}
 	done
 
@@ -170,7 +167,7 @@ src_install() {
 		dosbin bin/{fbguard,fb_smp_server}
 
 		#Temp should not be necessary, need to patch/fix
-		dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+		dosym usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
 	fi
 
 	exeinto /usr/bin/${PN}
@@ -182,18 +179,18 @@ src_install() {
 
 	exeinto /usr/$(get_libdir)/firebird/intl
 	dolib.so intl/libfbintl.so
-	dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+	dosym usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+	dosym etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
 
 	exeinto /usr/$(get_libdir)/${PN}/plugins
 	dolib.so plugins/libfbtrace.so
-	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+	dosym usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
 
 	exeinto /usr/$(get_libdir)/${PN}/UDF
 	doexe UDF/*.so
 
 	insinto /usr/share/${PN}/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
+	doins -r "${S}"/src/misc/upgrade/v2/*
 
 	insinto /etc/${PN}
 	insopts -m0644 -o firebird -g firebird
@@ -236,19 +233,19 @@ pkg_config() {
 
 	# if found /etc/security.gdb from previous install, backup, and restore as
 	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
+	if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
 		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
+		if [[ -f "${ROOT}/etc/firebird/security2.fdb" ]] ; then
+			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" || die
 		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
+		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
+		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
+		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
+		rm "${ROOT}/etc/firebird/security.gbk" || die
 
 		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
+		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
 
 		echo
 		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
@@ -258,27 +255,27 @@ pkg_config() {
 	fi
 
 	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
+	if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
+		touch "${ROOT}/etc/hosts.equiv" || die
+		chown root:0 "${ROOT}/etc/hosts.equiv" || die
+		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
 	fi
 
 	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
+	if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
 		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
 	fi
 
 	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
+	if grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
 		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
 	fi
 
 	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
+	if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
+		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
 		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Patrice Clement]

commit:     7a8dcc79f8f9fbc7471185bdab1abf62c2a0681b
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 18:52:28 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 18:52:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8dcc79

dev-db/firebird: Handover maintainership. Fixes bug 573234.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-db/firebird/metadata.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index e66d5d1..0c25aee 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -16,4 +16,11 @@
 	<upstream>
 		<remote-id type="sourceforge">firebird</remote-id>
 	</upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bear1650@mail.ru></email>
+	</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Patrick Lauer]

commit:     cd71b7c2ed69e6da0e83eebc4cfe445919ab7157
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 16:01:02 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 16:01:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd71b7c2

dev-db/firebird: Fix metadata.xml

Package-Manager: portage-2.2.27

 dev-db/firebird/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 0c25aee..dcb81a3 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -21,6 +21,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>bear1650@mail.ru></email>
+		<email>bear1650@mail.ru</email>
 	</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Kristian Fiskerstrand]

commit:     82f2ba41d3a959664863aabb66391c214a28cccf
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 20:35:32 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 20:35:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f2ba41

dev-db/firebird: Add name and description to metadata.xml

Bug: 573684

Package-Manager: portage-2.2.27

 dev-db/firebird/metadata.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index dcb81a3..c10e79b 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -22,5 +22,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>bear1650@mail.ru</email>
+		<name>Andrey Matrosov</name>
+		<description>Proxied maintainer, assign bugs to him</description>
 	</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     06590bfb0f7ec387135e4c00935c52dcef5d00ef
Author:     Maciej S. Szmigiero <mail <AT> maciej <DOT> szmigiero <DOT> name>
AuthorDate: Fri Jan  6 18:43:51 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 19:25:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06590bfb

dev-db/firebird: Restore SuperClassic, fix broken symlinks, libfbintl.so

Gentoo-Bug: 577956, 562716, 516760

1) Restore ability to build SuperClassic server

Commit 9b00135 ("Various syntax improvements and fixes") removed
ability to build the SuperClassic server by changing REQUIRED_USE so
that the required USE flags combination ("-client -superserver -xinetd")
is no longer permitted. It looks like this was done by mistake, since the
relevant code inside ebuild is still present and still works.

Fix this by allowing this USE flag combination again.

2) Portage warns about broken symlinks when firebird is emerged:
* QA Notice: Symbolic link /usr/lib64/firebird/lib/libib_util.so points to
/usr/lib64/firebird/lib/usr/lib64/libib_util.so which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/intl/fbintl.conf points to
/usr/lib64/firebird/intl/etc/firebird/fbintl.conf which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/intl/fbintl points to
/usr/lib64/firebird/intl/usr/lib64/libfbintl.so which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/plugins/libfbtrace.so
points to /usr/lib64/firebird/plugins/usr/lib64/libfbtrace.so which does
not exist.

Adjust symlink targets in ebuild to fix these broken links.

3) Don't use libintl.so SONAME for libfbintl.so

Firebird by default uses libintl.so.1 SONAME for libfbintl.so.1.
This means that ldconfig will make libintl.so.1 symlink to libfbintl.so.1.

However, actual libintl.so is a very different library, incompatible with
libfbintl.so. This breaks packages which tries to link to it, notably
dev-perl/libintl-perl.

Fix it by making libfbintl.so SONAME match its actual name.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

Closes: https://github.com/gentoo/gentoo/pull/3757

 dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild | 289 +++++++++++++++++++++++
 1 file changed, 289 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
new file mode 100644
index 00000000..f7d460a
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/"
+SRC_URI="
+	mirror://sourceforge/firebird/${MY_P}.tar.bz2
+	doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc client examples superserver xinetd"
+REQUIRED_USE="?? ( client superserver xinetd )"
+
+CDEPEND="
+	dev-libs/libedit
+	dev-libs/icu:=
+"
+DEPEND="${CDEPEND}
+	>=dev-util/btyacc-3.0-r2
+	doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+	MSG="sed of $3, required $2 lines modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use doc; then
+		# Unpack docs
+		mkdir "manuals" || die
+		cd "manuals" || die
+		unpack ib_b60_doc.zip
+	fi
+}
+
+src_prepare() {
+	# This patch might be portable, and not need to be duplicated per version
+	# also might no longer be necessary to patch deps or libs, just flags
+	epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+
+	use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+	use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+	# Rename references to isql to fbsql
+	# sed vs patch for portability and addtional location changes
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+	# Fix libfbintl SONAME which clashes with libintl
+	check_sed "$(sed -i -e \
+		's:LIB_LINK_SONAME,libintl.\$(SHRLIB_EXT):LIB_LINK_SONAME,libfbintl.\$(SHRLIB_EXT):w /dev/stdout' \
+		builds/posix/make.defaults | wc -l)" "1" "builds/posix/make.defaults" # 1 line
+
+	find "${S}" -name \*.sh -exec chmod +x {} + || die
+	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf \
+		--prefix=/usr/$(get_libdir)/firebird \
+		$(use_enable superserver) \
+		$(use_enable debug) \
+		--with-editline \
+		--with-system-editline \
+		--with-system-icu \
+		--with-fbbin=/usr/bin \
+		--with-fbsbin=/usr/sbin \
+		--with-fbconf=/etc/${PN} \
+		--with-fblib=/usr/$(get_libdir) \
+		--with-fbinclude=/usr/include \
+		--with-fbdoc=/usr/share/doc/${P} \
+		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+		--with-fbsample=/usr/share/doc/${P}/examples \
+		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
+		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+		--with-fbmisc=/usr/share/${PN} \
+		--with-fbsecure-db=/etc/${PN} \
+		--with-fbmsg=/usr/$(get_libdir)/${PN} \
+		--with-fblog=/var/log/${PN}/ \
+		--with-fbglock=/var/run/${PN} \
+		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+		--with-gnu-ld \
+		${myconf}
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
+	emake
+}
+
+src_install() {
+	cd "gen/${PN}" || die
+
+	if use doc; then
+		dodoc "${S}"/doc/*.pdf
+		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+	fi
+
+	doheader include/*
+
+	rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
+
+	insinto /usr/$(get_libdir)
+	dolib.so lib/*.so*
+
+	# links for backwards compatibility
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.msg
+
+	use client && return
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
+
+	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+	for bin in ${bins}; do
+		dobin bin/${bin}
+	done
+
+	dosbin bin/fb_lock_print
+	# SuperServer
+	if use superserver ; then
+		dosbin bin/{fbguard,fbserver}
+	# ClassicServer
+	elif use xinetd ; then
+		dosbin bin/fb_inet_server
+	# SuperClassic
+	else
+		dosbin bin/{fbguard,fb_smp_server}
+
+		#Temp should not be necessary, need to patch/fix
+		dosym ../../libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+	fi
+
+	exeinto /usr/bin/${PN}
+	exeopts -m0755
+	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+	insinto /usr/$(get_libdir)/${PN}/help
+	doins help/help.fdb
+
+	exeinto /usr/$(get_libdir)/firebird/intl
+	dolib.so intl/libfbintl.so
+	dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+	dosym /etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+	exeinto /usr/$(get_libdir)/${PN}/plugins
+	dolib.so plugins/libfbtrace.so
+	dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+
+	exeinto /usr/$(get_libdir)/${PN}/UDF
+	doexe UDF/*.so
+
+	insinto /usr/share/${PN}/upgrade
+	doins -r "${S}"/src/misc/upgrade/v2/*
+
+	insinto /etc/${PN}
+	insopts -m0644 -o firebird -g firebird
+	doins ../install/misc/*.conf
+	insopts -m0660 -o firebird -g firebird
+	doins security2.fdb
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+		fperms 640 /etc/conf.d/${PN}
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+	fperms 0644 /etc/logrotate.d/${PN}
+
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/${PN}
+	dodir /var/run/${PN}
+	keepdir /var/log/${PN}
+	keepdir /var/run/${PN}
+
+	use examples && docinto examples
+}
+
+pkg_postinst() {
+	use client && return
+
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+	chmod 750 "${ROOT}/etc/${PN}"
+}
+
+pkg_config() {
+	use client && return
+
+	# if found /etc/security.gdb from previous install, backup, and restore as
+	# /etc/security2.fdb
+	if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
+		# if we have scurity2.fdb already, back it 1st
+		if [[ -f "${ROOT}/etc/firebird/security2.fdb" ]] ; then
+			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" || die
+		fi
+		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
+		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
+		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
+		rm "${ROOT}/etc/firebird/security.gbk" || die
+
+		# make sure they are readable only to firebird
+		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+
+		echo
+		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+		echo
+	fi
+
+	# we need to enable local access to the server
+	if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
+		touch "${ROOT}/etc/hosts.equiv" || die
+		chown root:0 "${ROOT}/etc/hosts.equiv" || die
+		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
+	fi
+
+	# add 'localhost.localdomain' to the hosts.equiv file...
+	if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost' to the hosts.equiv file...
+	if grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	HS_NAME=`hostname`
+	if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
+		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /usr/lib/firebird/UDF"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     943cf2f17d4dce5dbe2fe8b8b747e8c8378a86d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 20:52:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:02:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943cf2f1

dev-db/firebird: 2.5.7 security version bump

Gentoo-bug: 610712

Package-Manager: portage-2.3.3

 dev-db/firebird/Manifest                      |   1 +
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 276 ++++++++++++++++++++++++++
 2 files changed, 277 insertions(+)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 112d4ca7d0..1b072ee743 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,4 @@
 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
 DIST Firebird-2.5.6.27020-0.tar.bz2 13610463 SHA256 8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826 SHA512 db336877bf53503f882f18fbd4c1ef080543d617432c48340a3ac2a9970d960e99d1ca76609c0b3037b2f457ac7c6e23f119e618919b86b52cff89db8aaf3062 WHIRLPOOL c6264f68e917def39eb1ea2ce167e24e6a5903593cb174da656ea7739fbef6ea0a5928a68c772336df10e69440f0cdb6a37c09c98cee6898a43b2f9dc85af671
+DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327 WHIRLPOOL d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
new file mode 100644
index 0000000000..e11da4841a
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="https://www.firebirdsql.org/"
+SRC_URI="
+	mirror://sourceforge/firebird/${MY_P}.tar.bz2
+	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc examples +superserver xinetd"
+REQUIRED_USE="?? ( superserver xinetd )"
+
+CDEPEND="
+	dev-libs/icu:=
+	dev-libs/libedit
+"
+DEPEND="${CDEPEND}
+	>=dev-util/btyacc-3.0-r2
+	doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+	MSG="sed of $3, required $2 line(s) modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use doc; then
+		# Unpack docs
+		mkdir "manuals" || die
+		cd "manuals" || die
+		unpack ib_b60_doc.zip
+	fi
+}
+
+src_prepare() {
+	use xinetd || eapply "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+	default
+
+	# Rename references to isql to fbsql
+	# sed vs patch for portability and addtional location changes
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+	find "${S}" -name \*.sh -exec chmod +x {} + || die
+	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf \
+		--prefix=/usr/$(get_libdir)/firebird \
+		$(use_enable superserver) \
+		$(use_enable debug) \
+		--with-editline \
+		--with-system-editline \
+		--with-system-icu \
+		--with-fbbin=/usr/bin \
+		--with-fbsbin=/usr/sbin \
+		--with-fbconf=/etc/${PN} \
+		--with-fblib=/usr/$(get_libdir) \
+		--with-fbinclude=/usr/include \
+		--with-fbdoc=/usr/share/doc/${P} \
+		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+		--with-fbsample=/usr/share/doc/${P}/examples \
+		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
+		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+		--with-fbmisc=/usr/share/${PN} \
+		--with-fbsecure-db=/etc/${PN} \
+		--with-fbmsg=/usr/$(get_libdir)/${PN} \
+		--with-fblog=/var/log/${PN}/ \
+		--with-fbglock=/var/run/${PN} \
+		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+		--with-gnu-ld \
+		${myconf}
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
+	emake
+}
+
+src_install() {
+	cd "gen/${PN}" || die
+
+	if use doc; then
+		dodoc "${S}"/doc/*.pdf
+		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+	fi
+
+	doheader include/*
+
+	rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
+
+	insinto /usr/$(get_libdir)
+	dolib.so lib/*.so*
+
+	# links for backwards compatibility
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.msg
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
+
+	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+	for bin in ${bins}; do
+		dobin bin/${bin}
+	done
+
+	dosbin bin/fb_lock_print
+	# SuperServer
+	if use superserver ; then
+		dosbin bin/{fbguard,fbserver}
+	# ClassicServer
+	elif use xinetd ; then
+		dosbin bin/fb_inet_server
+	# SuperClassic
+	else
+		dosbin bin/{fbguard,fb_smp_server}
+
+		#Temp should not be necessary, need to patch/fix
+		dosym ../../libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+	fi
+
+	exeinto /usr/bin/${PN}
+	exeopts -m0755
+	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+	insinto /usr/$(get_libdir)/${PN}/help
+	doins help/help.fdb
+
+	exeinto /usr/$(get_libdir)/firebird/intl
+	dolib.so intl/libfbintl.so
+	dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+	dosym libfbintl.so /usr/$(get_libdir)/libfbintl.so.1
+	dosym /etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+	exeinto /usr/$(get_libdir)/${PN}/plugins
+	dolib.so plugins/libfbtrace.so
+	dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+	dosym libfbtrace.so /usr/$(get_libdir)/libfbtrace.so.0
+
+	exeinto /usr/$(get_libdir)/${PN}/UDF
+	doexe UDF/*.so
+
+	insinto /usr/share/${PN}/upgrade
+	doins -r "${S}"/src/misc/upgrade/v2/*
+
+	insinto /etc/${PN}
+	insopts -m0644 -o firebird -g firebird
+	doins ../install/misc/*.conf
+	insopts -m0660 -o firebird -g firebird
+	doins security2.fdb
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+		fperms 640 /etc/conf.d/${PN}
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+	fperms 0644 /etc/logrotate.d/${PN}
+
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
+
+	use examples && docinto examples
+}
+
+pkg_postinst() {
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+	chmod 750 "${ROOT}/etc/${PN}"
+}
+
+pkg_config() {
+	# if found /etc/security.gdb from previous install, backup, and restore as
+	# /etc/security2.fdb
+	if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
+		# if we have scurity2.fdb already, back it 1st
+		if [[ -f "${ROOT}/etc/firebird/security2.fdb" ]] ; then
+			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" || die
+		fi
+		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
+		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
+		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
+		rm "${ROOT}/etc/firebird/security.gbk" || die
+
+		# make sure they are readable only to firebird
+		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
+
+		echo
+		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+		echo
+	fi
+
+	# we need to enable local access to the server
+	if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
+		touch "${ROOT}/etc/hosts.equiv" || die
+		chown root:0 "${ROOT}/etc/hosts.equiv" || die
+		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
+	fi
+
+	# add 'localhost.localdomain' to the hosts.equiv file...
+	if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost' to the hosts.equiv file...
+	if grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" ; then
+		echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	HS_NAME=`hostname`
+	if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
+		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
+		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /usr/$(get_libdir)/firebird/UDF"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     b4a4598dd8611ff10f15ee37e41113cbc19fc847
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 23:54:46 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 13 23:54:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a4598d

dev-db/firebird: move to office project :/

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/metadata.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 0d7a6ff58e8..64d8608cc9a 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -15,13 +15,7 @@
 	<upstream>
 		<remote-id type="sourceforge">firebird</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>bear1650@mail.ru</email>
-		<name>Andrey Matrosov</name>
-		<description>Proxied maintainer, assign bugs to him</description>
-	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>office@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     110938ff6d00e8d351a154ffabc29592b2d9cbc9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 22:28:47 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 18 22:29:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110938ff

dev-db/firebird: Make it build. It might even install.

See libreoffice core repo for patches still to be added.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 345fb30b315..9180b5aa186 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -17,8 +17,7 @@ LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="debug doc examples +superserver xinetd"
-REQUIRED_USE="?? ( superserver xinetd )"
+IUSE="doc examples xinetd"
 
 CDEPEND="
 	dev-libs/icu:=
@@ -33,8 +32,6 @@ RDEPEND="${CDEPEND}
 	!sys-cluster/ganglia
 "
 
-RESTRICT="userpriv"
-
 S="${WORKDIR}/${MY_P}"
 
 # this is work in progress and likely does not build yet
@@ -87,13 +84,16 @@ src_configure() {
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
 
+	# otherwise this doesnt build with gcc-6?
+	# http://tracker.firebirdsql.org/browse/CORE-5099
+	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -Wno-narrowing
+	# -std=c++11
+
 	econf \
 		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver) \
-		$(use_enable debug) \
 		--with-editline \
 		--with-system-editline \
-		--with-system-icu \
 		--with-fbbin=/usr/bin \
 		--with-fbsbin=/usr/sbin \
 		--with-fbconf=/etc/${PN} \
@@ -121,7 +121,7 @@ src_compile() {
 }
 
 src_install() {
-	cd "gen/${PN}" || die
+	cd "gen/Release/${PN}" || die
 
 	if use doc; then
 		dodoc "${S}"/doc/*.pdf

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     b64975c35fc8e27cde82a73c36ecf29f67eabdaa
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 11:57:45 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 21 11:57:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64975c3

dev-db/firebird: Re-add keywords

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 4bee6fc80bd..bf2fea73c53 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="doc examples +server xinetd"
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     95f13548db53b231b5fcd6114c2364b745b164f2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 01:34:50 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 25 01:36:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f13548

dev-db/firebird: Install missing fb_config

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild | 235 +++++++++++++++++++++++
 1 file changed, 235 insertions(+)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
new file mode 100644
index 00000000000..d28f77e1050
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="https://www.firebirdsql.org/"
+SRC_URI="
+	mirror://sourceforge/firebird/${MY_P}.tar.bz2
+	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples +server xinetd"
+
+# FIXME: cloop?
+CDEPEND="
+	dev-libs/libtommath
+	dev-libs/icu:=
+	dev-libs/libedit
+"
+DEPEND="${CDEPEND}
+	>=dev-util/btyacc-3.0-r2
+	doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-unbundle.patch
+	"${FILESDIR}/${P}"-gcc6.patch
+	"${FILESDIR}/${P}"-cloop-compiler.patch
+)
+
+pkg_pretend() {
+	if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+		ewarn
+		ewarn "The presence of server connections may prevent isql or gsec"
+		ewarn "from establishing an embedded connection. Accordingly,"
+		ewarn "creating employee.fdb or security3.fdb could fail."
+		ewarn "It is more secure to stop the firebird daemon before running emerge."
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+	MSG="sed of $3, required $2 line(s) modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use doc; then
+		# Unpack docs
+		mkdir "manuals" || die
+		cd "manuals" || die
+		unpack ib_b60_doc.zip
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Rename references to isql to fbsql
+	# sed vs patch for portability and addtional location changes
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+	find "${S}" -name \*.sh -exec chmod +x {} + || die
+	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	# otherwise this doesnt build with gcc-6
+	# http://tracker.firebirdsql.org/browse/CORE-5099
+	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+
+	econf \
+		--prefix=/usr/$(get_libdir)/firebird \
+		--with-editline \
+		--with-system-editline \
+		--with-fbbin=/usr/bin \
+		--with-fbsbin=/usr/sbin \
+		--with-fbconf=/etc/${PN} \
+		--with-fblib=/usr/$(get_libdir) \
+		--with-fbinclude=/usr/include \
+		--with-fbdoc=/usr/share/doc/${PF} \
+		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+		--with-fbsample=/usr/share/doc/${PF}/examples \
+		--with-fbsample-db=/usr/share/doc/${PF}/examples/db \
+		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+		--with-fbmisc=/usr/share/${PN} \
+		--with-fbsecure-db=/etc/${PN} \
+		--with-fbmsg=/usr/$(get_libdir)/${PN} \
+		--with-fblog=/var/log/${PN}/ \
+		--with-fbglock=/var/run/${PN} \
+		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+		--with-gnu-ld \
+		${myconf}
+}
+
+# from linux underground, merging into this here
+src_install() {
+	if use doc; then
+		dodoc -r doc
+		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+	fi
+
+	cd "${S}/gen/Release/${PN}" || die
+
+	doheader include/*
+	dolib.so lib/*.so*
+
+	# links for backwards compatibility
+	insinto /usr/$(get_libdir)
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+	insinto /usr/share/${PN}/msg
+	doins *.msg
+
+	use server || return
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
+
+	dobin bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
+	dosbin bin/{firebird,fbguard,fb_lock_print}
+
+	insinto /usr/share/${PN}/help
+	# why???
+	insopts -m0660 -o firebird -g firebird
+	doins help/help.fdb
+
+	into /usr/$(get_libdir)/${PN}/intl
+	dolib.so intl/libfbintl.so
+	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
+
+	insinto /usr/$(get_libdir)/${PN}/intl
+	insopts -m0644 -o root -g root
+	doins intl/fbintl.conf
+
+	# plugins
+	exeinto /usr/$(get_libdir)/${PN}/plugins
+	doexe plugins/*.so
+	exeinto /usr/$(get_libdir)/${PN}/plugins/udr
+	doexe plugins/udr/*.so
+
+	exeinto /usr/$(get_libdir)/${PN}/UDF
+	doexe UDF/*.so
+
+	# logging (do we really need the perms?)
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# configuration files
+	insinto /etc/${PN}/plugins
+	doins plugins/udr_engine.conf
+	insinto /etc/${PN}
+	doins {databases,fbtrace,firebird,plugins}.conf
+
+	# install secutity3.fdb
+	insopts -m0660 -o firebird -g firebird
+	doins security3.fdb
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN}
+	fi
+
+	if use examples; then
+		cd examples
+		insinto /usr/share/${PN}/examples
+		insopts -m0644 -o root -g root
+		doins -r api
+		doins -r dbcrypt
+		doins -r include
+		doins -r interfaces
+		doins -r package
+		doins -r stat
+		doins -r udf
+		doins -r udr
+		doins CMakeLists.txt
+		doins functions.c
+		doins README
+		insinto /usr/share/${PN}/examples/empbuild
+		insopts -m0660 -o firebird -g firebird
+		doins empbuild/employee.fdb
+	fi
+
+	einfo
+	elog "Starting with version 3, server mode is set in firebird.conf"
+	elog "The default setting is superserver."
+	einfo
+	elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
+	einfo
+	ewarn "${CATEGORY}/${PF} is still a tad experimental. Please test and file bugs!"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     317d521319e425b22bf5dfb9a1774ecbd36d6b99
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 01:35:14 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 25 01:36:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317d5213

dev-db/firebird: Remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 235 --------------------------
 1 file changed, 235 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
deleted file mode 100644
index bf2fea73c53..00000000000
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="https://www.firebirdsql.org/"
-SRC_URI="
-	mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples +server xinetd"
-
-# FIXME: cloop?
-CDEPEND="
-	dev-libs/libtommath
-	dev-libs/icu:=
-	dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-unbundle.patch
-	"${FILESDIR}/${P}"-gcc6.patch
-	"${FILESDIR}/${P}"-cloop-compiler.patch
-)
-
-pkg_pretend() {
-	if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
-		ewarn
-		ewarn "The presence of server connections may prevent isql or gsec"
-		ewarn "from establishing an embedded connection. Accordingly,"
-		ewarn "creating employee.fdb or security3.fdb could fail."
-		ewarn "It is more secure to stop the firebird daemon before running emerge."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-	MSG="sed of $3, required $2 line(s) modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	unpack "${MY_P}.tar.bz2"
-	if use doc; then
-		# Unpack docs
-		mkdir "manuals" || die
-		cd "manuals" || die
-		unpack ib_b60_doc.zip
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find "${S}" -name \*.sh -exec chmod +x {} + || die
-	rm -r "${S}"/extern/{btyacc,editline,icu} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	# otherwise this doesnt build with gcc-6
-	# http://tracker.firebirdsql.org/browse/CORE-5099
-	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		--with-editline \
-		--with-system-editline \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${PF} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${PF}/examples \
-		--with-fbsample-db=/usr/share/doc/${PF}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-# from linux underground, merging into this here
-src_install() {
-	if use doc; then
-		dodoc -r doc
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	cd "${S}/gen/Release/${PN}" || die
-
-	doheader include/*
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	insinto /usr/$(get_libdir)
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/share/${PN}/msg
-	doins *.msg
-
-	use server || return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
-
-	dobin bin/{fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
-	dosbin bin/{firebird,fbguard,fb_lock_print}
-
-	insinto /usr/share/${PN}/help
-	# why???
-	insopts -m0660 -o firebird -g firebird
-	doins help/help.fdb
-
-	into /usr/$(get_libdir)/${PN}/intl
-	dolib.so intl/libfbintl.so
-	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
-
-	insinto /usr/$(get_libdir)/${PN}/intl
-	insopts -m0644 -o root -g root
-	doins intl/fbintl.conf
-
-	# plugins
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	doexe plugins/*.so
-	exeinto /usr/$(get_libdir)/${PN}/plugins/udr
-	doexe plugins/udr/*.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	# logging (do we really need the perms?)
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# configuration files
-	insinto /etc/${PN}/plugins
-	doins plugins/udr_engine.conf
-	insinto /etc/${PN}
-	doins {databases,fbtrace,firebird,plugins}.conf
-
-	# install secutity3.fdb
-	insopts -m0660 -o firebird -g firebird
-	doins security3.fdb
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN}
-	fi
-
-	if use examples; then
-		cd examples
-		insinto /usr/share/${PN}/examples
-		insopts -m0644 -o root -g root
-		doins -r api
-		doins -r dbcrypt
-		doins -r include
-		doins -r interfaces
-		doins -r package
-		doins -r stat
-		doins -r udf
-		doins -r udr
-		doins CMakeLists.txt
-		doins functions.c
-		doins README
-		insinto /usr/share/${PN}/examples/empbuild
-		insopts -m0660 -o firebird -g firebird
-		doins empbuild/employee.fdb
-	fi
-
-	einfo
-	elog "Starting with version 3, server mode is set in firebird.conf"
-	elog "The default setting is superserver."
-	einfo
-	elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
-	einfo
-	ewarn "${CATEGORY}/${PF} is still a tad experimental. Please test and file bugs!"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Hüttel]

commit:     87246e2c71a87476b54e313e3045a62107b6a0b2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 12:06:53 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 27 12:07:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87246e2c

dev-db/firebird: Fix libfbintl.so location

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ...ebird-3.0.2.32703.0-r1.ebuild => firebird-3.0.2.32703.0-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
similarity index 98%
rename from dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
rename to dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index d28f77e1050..0ffc66ca591 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -162,8 +162,8 @@ src_install() {
 	insopts -m0660 -o firebird -g firebird
 	doins help/help.fdb
 
-	into /usr/$(get_libdir)/${PN}/intl
-	dolib.so intl/libfbintl.so
+	exeinto /usr/$(get_libdir)/${PN}/intl
+	doexe intl/libfbintl.so
 	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
 
 	insinto /usr/$(get_libdir)/${PN}/intl

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     99d88bb141c0722d9fe31cdc1a31c284926d5e0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 20:00:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 20:14:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d88bb1

dev-db/firebird: Drop redundant ${S} in src_prepare

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild    | 4 ++--
 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index 72385210ce9..74bd1f31074 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -79,8 +79,8 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-	find "${S}" -name \*.sh -exec chmod +x {} + || die
-	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+	find . -name \*.sh -exec chmod +x {} + || die
+	rm -r extern/{btyacc,editline,icu} || die
 
 	mv configure.in configure.ac || "failed to mv configure.in configure.ac"
 

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index 0ffc66ca591..f502dbb7b2c 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -88,8 +88,8 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-	find "${S}" -name \*.sh -exec chmod +x {} + || die
-	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+	find . -name \*.sh -exec chmod +x {} + || die
+	rm -r extern/{btyacc,editline,icu} || die
 
 	eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     b18f29320ab45f391f083297ded21307301051c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 19:59:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 20:14:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18f2932

dev-db/firebird: Fix configure.in warning

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index afe4c215521..72385210ce9 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -82,6 +82,8 @@ src_prepare() {
 	find "${S}" -name \*.sh -exec chmod +x {} + || die
 	rm -r "${S}"/extern/{btyacc,editline,icu} || die
 
+	mv configure.in configure.ac || "failed to mv configure.in configure.ac"
+
 	eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     6a564498e179df4112a2a165d90c66eb75289bb8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  7 08:26:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 08:26:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a564498

dev-db/firebird: Add missing die

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index 74bd1f31074..68a0c71d850 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
 	find . -name \*.sh -exec chmod +x {} + || die
 	rm -r extern/{btyacc,editline,icu} || die
 
-	mv configure.in configure.ac || "failed to mv configure.in configure.ac"
+	mv configure.in configure.ac || die "failed to mv configure.in configure.ac"
 
 	eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[David Seifert]

commit:     6da7054dd7262e18d233537790d6b00669e3efc2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 18:17:20 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:40:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da7054d

dev-db/firebird: Always build in C++11 mode

Closes: https://bugs.gentoo.org/618774
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index f502dbb7b2c..8ab5dd6952c 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,7 +101,7 @@ src_configure() {
 	# otherwise this doesnt build with gcc-6
 	# http://tracker.firebirdsql.org/browse/CORE-5099
 	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -std=c++11
 
 	econf \
 		--prefix=/usr/$(get_libdir)/firebird \

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Andreas Sturmlechner]

commit:     4d44504813bb967b88a83a61b31b42ecfd421758
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 14:13:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 16:51:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d445048

dev-db/firebird: 3.0.4.33054.0 version bump

Bug: https://bugs.gentoo.org/686150
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/firebird/Manifest                      |   1 +
 dev-db/firebird/firebird-3.0.4.33054.0.ebuild | 230 ++++++++++++++++++++++++++
 2 files changed, 231 insertions(+)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index d2a44ea8aed..ad827f3ecc0 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
+DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d SHA512 a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
new file mode 100644
index 00000000000..c7b0169cad0
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN/f/F}-$(ver_rs 4 '-')
+inherit autotools flag-o-matic user
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="https://www.firebirdsql.org/"
+SRC_URI="
+	https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 '_' $(ver_cut 1-3))/${MY_P}.tar.bz2
+	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +server xinetd"
+
+BDEPEND="
+	>=dev-util/btyacc-3.0-r2
+	doc? ( app-arch/unzip )
+"
+# FIXME: cloop?
+DEPEND="
+	dev-libs/icu:=
+	dev-libs/libedit
+	dev-libs/libtommath
+"
+RDEPEND="${DEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
+	"${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+)
+
+pkg_pretend() {
+	if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+		ewarn
+		ewarn "The presence of server connections may prevent isql or gsec"
+		ewarn "from establishing an embedded connection. Accordingly,"
+		ewarn "creating employee.fdb or security3.fdb could fail."
+		ewarn "It is more secure to stop the firebird daemon before running emerge."
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+	MSG="sed of $3, required $2 line(s) modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use doc; then
+		# Unpack docs
+		mkdir "manuals" || die
+		cd "manuals" || die
+		unpack ib_b60_doc.zip
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Rename references to isql to fbsql
+	# sed vs patch for portability and addtional location changes
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+	find . -name \*.sh -exec chmod +x {} + || die
+	rm -r extern/{btyacc,editline,icu} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	# otherwise this doesnt build with gcc-6
+	# http://tracker.firebirdsql.org/browse/CORE-5099
+	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -std=c++11
+
+	local myeconfargs=(
+		--prefix=/usr/$(get_libdir)/firebird
+		--with-editline
+		--with-system-editline
+		--with-fbbin=/usr/bin
+		--with-fbsbin=/usr/sbin
+		--with-fbconf=/etc/${PN}
+		--with-fblib=/usr/$(get_libdir)
+		--with-fbinclude=/usr/include
+		--with-fbdoc=/usr/share/doc/${PF}
+		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF
+		--with-fbsample=/usr/share/doc/${PF}/examples
+		--with-fbsample-db=/usr/share/doc/${PF}/examples/db
+		--with-fbhelp=/usr/$(get_libdir)/${PN}/help
+		--with-fbintl=/usr/$(get_libdir)/${PN}/intl
+		--with-fbmisc=/usr/share/${PN}
+		--with-fbsecure-db=/etc/${PN}
+		--with-fbmsg=/usr/$(get_libdir)/${PN}
+		--with-fblog=/var/log/${PN}/
+		--with-fbglock=/var/run/${PN}
+		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
+		--with-gnu-ld
+	)
+	econf "${myeconfargs[@]}"		
+}
+
+# from linux underground, merging into this here
+src_install() {
+	if use doc; then
+		dodoc -r doc
+		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+	fi
+
+	cd "${S}/gen/Release/${PN}" || die
+
+	doheader include/*
+	dolib.so lib/*.so*
+
+	# links for backwards compatibility
+	insinto /usr/$(get_libdir)
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+	insinto /usr/share/${PN}/msg
+	doins *.msg
+
+	use server || return
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
+
+	dobin bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
+	dosbin bin/{firebird,fbguard,fb_lock_print}
+
+	insinto /usr/share/${PN}/help
+	# why???
+	insopts -m0660 -o firebird -g firebird
+	doins help/help.fdb
+
+	exeinto /usr/$(get_libdir)/${PN}/intl
+	doexe intl/libfbintl.so
+	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
+
+	insinto /usr/$(get_libdir)/${PN}/intl
+	insopts -m0644 -o root -g root
+	doins intl/fbintl.conf
+
+	# plugins
+	exeinto /usr/$(get_libdir)/${PN}/plugins
+	doexe plugins/*.so
+	exeinto /usr/$(get_libdir)/${PN}/plugins/udr
+	doexe plugins/udr/*.so
+
+	exeinto /usr/$(get_libdir)/${PN}/UDF
+	doexe UDF/*.so
+
+	# logging (do we really need the perms?)
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# configuration files
+	insinto /etc/${PN}/plugins
+	doins plugins/udr_engine.conf
+	insinto /etc/${PN}
+	doins {databases,fbtrace,firebird,plugins}.conf
+
+	# install secutity3.fdb
+	insopts -m0660 -o firebird -g firebird
+	doins security3.fdb
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN}
+	fi
+
+	if use examples; then
+		cd examples || die
+		insinto /usr/share/${PN}/examples
+		insopts -m0644 -o root -g root
+		doins -r api
+		doins -r dbcrypt
+		doins -r include
+		doins -r interfaces
+		doins -r package
+		doins -r stat
+		doins -r udf
+		doins -r udr
+		doins CMakeLists.txt
+		doins functions.c
+		doins README
+		insinto /usr/share/${PN}/examples/empbuild
+		insopts -m0660 -o firebird -g firebird
+		doins empbuild/employee.fdb
+	fi
+
+	elog "Starting with version 3, server mode is set in firebird.conf"
+	elog "The default setting is superserver."
+	elog
+	elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[David Seifert]

commit:     27fa1cefc0bc9c31a2cf75f441869bef94d33aa8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 12:21:25 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 12:36:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27fa1cef

dev-db/firebird: [QA] Fix trailing whitespace

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-db/firebird/firebird-3.0.4.33054.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
index c7b0169cad0..899d3889c9e 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
@@ -123,7 +123,7 @@ src_configure() {
 		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
 		--with-gnu-ld
 	)
-	econf "${myeconfargs[@]}"		
+	econf "${myeconfargs[@]}"
 }
 
 # from linux underground, merging into this here

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Conrad Kostecki]

commit:     cd2d2a5fcde8a09916201a936c7566eb097f5269
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:34:50 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 20:08:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2d2a5f

dev-db/firebird: migrate to glep-81

Bug: https://bugs.gentoo.org/781275
Closes: https://github.com/gentoo/gentoo/pull/24809
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ....0-r1.ebuild => firebird-3.0.4.33054.0-r2.ebuild} | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
similarity index 96%
rename from dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
rename to dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
index 02ac62b72c4c..171554c2aebe 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_P=${PN/f/F}-$(ver_rs 4 '-')
-inherit autotools flag-o-matic user
+inherit autotools flag-o-matic
 
 DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="https://www.firebirdsql.org/"
 SRC_URI="
 	https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 '_' $(ver_cut 1-3))/${MY_P}.tar.bz2
-	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
@@ -27,13 +29,14 @@ DEPEND="
 	dev-libs/libedit
 	dev-libs/libtommath
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-group/firebird
+	acct-user/firebird
 	xinetd? ( virtual/inetd )
 	!sys-cluster/ganglia
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
 	"${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
@@ -50,11 +53,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
 check_sed() {
 	MSG="sed of $3, required $2 line(s) modified $1"
 	einfo "${MSG}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Sam James]

commit:     08012bba5588a7dc98eaf29d7e53269a6a52ab09
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 14:15:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 15:44:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08012bba

dev-db/firebird: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/firebird/metadata.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index b42ab3611d47..1183b4f3ae97 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+	</maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.
@@ -14,8 +17,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">firebird</remote-id>
+		<remote-id type="github">FirebirdSQL/firebird</remote-id>
 	</upstream>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Arthur Zamarin]

commit:     5be434a994db20abdeb5b819ba818a9adcbbd2a6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 13:27:32 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  9 13:27:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be434a9

dev-db/firebird: Keyword 3.0.10.33601.0-r1 arm64, #905891

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
index 61f61df905da..cf1793d314a8 100644
--- a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc examples +server xinetd"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

[Sam James]

commit:     87c7b4704b5a0e5dd7f02b0d21f59fdf3ef1999b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 01:09:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 01:09:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c7b470

dev-db/firebird: filter LTO, no SA, no lifetime DSE

Bug: https://gcc.gnu.org/PR107078
Bug: https://github.com/FirebirdSQL/firebird/issues/5384
Bug: https://github.com/FirebirdSQL/firebird/issues/7308
Closes: https://bugs.gentoo.org/917662
Closes: https://bugs.gentoo.org/924659
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild | 8 ++++++--
 dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild  | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
index cf1793d314a8..5fd90979b8e5 100644
--- a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_P=${PN/f/F}-$(ver_rs 4 '-')
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="https://www.firebirdsql.org/"
@@ -91,6 +91,10 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
+	# bug #917662, bug #924659
+	filter-lto
+	append-flags -fno-strict-aliasing $(test-flags-CXX -fno-lifetime-dse)
+
 	# use gentoo's CXXFLAGS instead of whatever firebird decided on
 	# doesn't replace all firebird's CXXFLAGS, but at least this is last,
 	# so it can do some overrides

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
index 171554c2aebe..6f2ba7ca3b89 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -93,6 +93,10 @@ src_configure() {
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
 
+	# bug #917662, bug #924659
+	filter-lto
+	append-flags -fno-strict-aliasing $(test-flags-CXX -fno-lifetime-dse)
+
 	# otherwise this doesnt build with gcc-6
 	# http://tracker.firebirdsql.org/browse/CORE-5099
 	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks