summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2007-09-21 02:15:04 +0000
committerWilliam Thomson <wltjr@gentoo.org>2007-09-21 02:15:04 +0000
commitfd008478ec9a4b13289a7001dce943580f34499a (patch)
tree99dbce67a40b207fb86cc8694cf1c0f989899bef /dev-db
parentqbankmanager: remove obsolete patches (diff)
downloadhistorical-fd008478ec9a4b13289a7001dce943580f34499a.tar.gz
historical-fd008478ec9a4b13289a7001dce943580f34499a.tar.bz2
historical-fd008478ec9a4b13289a7001dce943580f34499a.zip
Major changes, Firebird is no longer installed in opt :). Added paths patch. Took over as sole maintainer since I am doing all the work anyway ;)
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/firebird/ChangeLog14
-rw-r--r--dev-db/firebird/Manifest72
-rw-r--r--dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r46
-rw-r--r--dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r56
-rw-r--r--dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r16
-rw-r--r--dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch45
-rw-r--r--dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch41
-rw-r--r--dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch230
-rw-r--r--dev-db/firebird/files/firebird.conf.d.24
-rw-r--r--dev-db/firebird/files/firebird.init.d.233
-rw-r--r--dev-db/firebird/files/firebird.xinetd.211
-rw-r--r--dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild248
-rw-r--r--dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild (renamed from dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild)142
-rw-r--r--dev-db/firebird/metadata.xml4
14 files changed, 394 insertions, 468 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index ac998f6ff817..71186b737c38 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for dev-db/firebird
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.72 2007/09/16 14:17:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.73 2007/09/21 02:15:03 wltjr Exp $
+
+*firebird-2.0.3.12981.0-r1 (21 Sep 2007)
+
+ 21 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ -files/firebird-2.0.1.12855.0-external-libs.patch,
+ -files/firebird-2.0.1.12855.0-make-deps.patch,
+ +files/firebird-2.0.3.12981.0-paths.patch, +files/firebird.conf.d.2,
+ +files/firebird.init.d.2, +files/firebird.xinetd.2, metadata.xml,
+ -firebird-2.0.1.12855.0-r4.ebuild, -firebird-2.0.1.12855.0-r5.ebuild,
+ +firebird-2.0.3.12981.0-r1.ebuild:
+ Major changes, Firebird is no longer installed in opt :). Added paths patch.
+ Took over as sole maintainer since I am doing all the work anyway ;)
16 Sep 2007; Christoph Mende <angelos@gentoo.org>
firebird-2.0.3.12981.0.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index c47e07cb1031..eb3ebf4b838e 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird 50
RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird 50
SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird 50
-AUX firebird-2.0.1.12855.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
-MD5 e10b40f875eb2d8f32b8547efb176ec0 files/firebird-2.0.1.12855.0-external-libs.patch 1891
-RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 files/firebird-2.0.1.12855.0-external-libs.patch 1891
-SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da files/firebird-2.0.1.12855.0-external-libs.patch 1891
-AUX firebird-2.0.1.12855.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
-MD5 e0ff4a56391f46b0ee3f8ab2faaafe6a files/firebird-2.0.1.12855.0-make-deps.patch 1369
-RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b files/firebird-2.0.1.12855.0-make-deps.patch 1369
-SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb files/firebird-2.0.1.12855.0-make-deps.patch 1369
AUX firebird-2.0.3.12981.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
MD5 e10b40f875eb2d8f32b8547efb176ec0 files/firebird-2.0.3.12981.0-external-libs.patch 1891
RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 files/firebird-2.0.3.12981.0-external-libs.patch 1891
@@ -21,20 +10,35 @@ AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d
MD5 e0ff4a56391f46b0ee3f8ab2faaafe6a files/firebird-2.0.3.12981.0-make-deps.patch 1369
RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b files/firebird-2.0.3.12981.0-make-deps.patch 1369
SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb files/firebird-2.0.3.12981.0-make-deps.patch 1369
+AUX firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba11be2d07455dd SHA1 d4d3534119d48990cf8bef501f74371e07d8a14a SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7
+MD5 ecf89f096f817130287b8f42967d0b6e files/firebird-2.0.3.12981.0-paths.patch 12954
+RMD160 acac734477715e2bcf5833b7fba11be2d07455dd files/firebird-2.0.3.12981.0-paths.patch 12954
+SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7 files/firebird-2.0.3.12981.0-paths.patch 12954
AUX firebird.conf.d 80 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 SHA1 9442726f3e59887ecc40333c0214045cd8f78d50 SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f
MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 files/firebird.conf.d 80
SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f files/firebird.conf.d 80
+AUX firebird.conf.d.2 86 RMD160 4be90549bb4c29010c294a3fd102cc7d0ee91f45 SHA1 2ee70d56395b581acc48f68067e595a921bb5a8a SHA256 822ef527ca4a2717fc4572321b4b77f3c7439f281c373896a42d83273f5a86ea
+MD5 2f59f6abb9968712126f9c090b198218 files/firebird.conf.d.2 86
+RMD160 4be90549bb4c29010c294a3fd102cc7d0ee91f45 files/firebird.conf.d.2 86
+SHA256 822ef527ca4a2717fc4572321b4b77f3c7439f281c373896a42d83273f5a86ea files/firebird.conf.d.2 86
AUX firebird.init.d 697 RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 SHA1 f2684574fcb5960403ad1d65d5b2f13c694219c2 SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83
MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697
RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 files/firebird.init.d 697
SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83 files/firebird.init.d 697
+AUX firebird.init.d.2 691 RMD160 77b6fd440aadc515ce7c182c7ea2e41f3b5fcd1f SHA1 c8e49a255400e348c7fc6989dd46868267f24092 SHA256 b879956a3fc7b440885d558ef3f87c6df2b7e7c9b161cbf1f9e26c8589e839ed
+MD5 213897942ab82782e99215ea0feb3523 files/firebird.init.d.2 691
+RMD160 77b6fd440aadc515ce7c182c7ea2e41f3b5fcd1f files/firebird.init.d.2 691
+SHA256 b879956a3fc7b440885d558ef3f87c6df2b7e7c9b161cbf1f9e26c8589e839ed files/firebird.init.d.2 691
AUX firebird.xinetd 208 RMD160 c9b6f61321861ce86c14c3fec0f13909865e6344 SHA1 ca1cd79282a9f1daedbbe3b053efcba0f79a989d SHA256 802738bd350a19c3abbd99be0bcf3d52b3c4cdc09211f2de2b89d25c54fb5a6c
MD5 a0c95b227bd9ebd0cb1a57a46e59141a files/firebird.xinetd 208
RMD160 c9b6f61321861ce86c14c3fec0f13909865e6344 files/firebird.xinetd 208
SHA256 802738bd350a19c3abbd99be0bcf3d52b3c4cdc09211f2de2b89d25c54fb5a6c files/firebird.xinetd 208
+AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
+MD5 30b9dcbf549f3b99040b24914b085acf files/firebird.xinetd.2 199
+RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 files/firebird.xinetd.2 199
+SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 files/firebird.xinetd.2 199
DIST Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f SHA1 fc64d475222257b269378451a69167ea53852ece SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe
-DIST Firebird-2.0.1.12855-0.tar.bz2 12582690 RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f SHA1 a364548028e411919a94b5be4263b9914b696bda SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e
DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
DIST firebird-1.5.4-debian-patchset.tar.bz2 22696 RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 SHA1 e925f90d18ece6eb5c8a2645f7e2f559e5e7b153 SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea
DIST firebird-1.5.4.4910.tar.bz2 5087076 RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 SHA1 684860f6b1b77f5068ea175d3e08a7c839bb92a5 SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556
@@ -43,42 +47,28 @@ EBUILD firebird-1.5.4-r3.ebuild 7903 RMD160 6969baf1bd750a604aba25891c7e2f499f9b
MD5 555395205f844182a65cfee61aaf0d49 firebird-1.5.4-r3.ebuild 7903
RMD160 6969baf1bd750a604aba25891c7e2f499f9bd134 firebird-1.5.4-r3.ebuild 7903
SHA256 b5143ec87334beeeb7af09be5d080eb7bdaae01f9856b0c2e25d0f1ff7aaf62a firebird-1.5.4-r3.ebuild 7903
-EBUILD firebird-2.0.1.12855.0-r4.ebuild 6981 RMD160 0880f476b85af6c5ebfc3eeb195024ae5d5878c5 SHA1 f1b41da9b4c4bf96e864a6f4541baa8533e445a4 SHA256 8afadd880dd549b9263d0c8902a0527d403bccdaf85abb305eab6eed2b74b629
-MD5 8fd6af8c444063ba03445c59f3a10e3a firebird-2.0.1.12855.0-r4.ebuild 6981
-RMD160 0880f476b85af6c5ebfc3eeb195024ae5d5878c5 firebird-2.0.1.12855.0-r4.ebuild 6981
-SHA256 8afadd880dd549b9263d0c8902a0527d403bccdaf85abb305eab6eed2b74b629 firebird-2.0.1.12855.0-r4.ebuild 6981
-EBUILD firebird-2.0.1.12855.0-r5.ebuild 7052 RMD160 3a48c449b2331eeb5396b5aa8b3a5d507b016c9c SHA1 33bfb0e63f913b8d1ac138db6fb88f4cea20f9e5 SHA256 b8f6ff2e1842cf1b6037557726122c28b1cd2a36f12cd757d32545ebd2eea145
-MD5 faf8a0548e7f17c97a2da5537475513d firebird-2.0.1.12855.0-r5.ebuild 7052
-RMD160 3a48c449b2331eeb5396b5aa8b3a5d507b016c9c firebird-2.0.1.12855.0-r5.ebuild 7052
-SHA256 b8f6ff2e1842cf1b6037557726122c28b1cd2a36f12cd757d32545ebd2eea145 firebird-2.0.1.12855.0-r5.ebuild 7052
+EBUILD firebird-2.0.3.12981.0-r1.ebuild 6599 RMD160 b67734f7e34928bc4aac569fe012f2d087161b15 SHA1 c48a66ac61564f43aee90e673ee0581591b3d14b SHA256 cac8a2a54b138fa6fbad8c32868d152888b9689c5adc377936fdfb760967ddbb
+MD5 e059264f26e116ee87f6bbd28f8a89c6 firebird-2.0.3.12981.0-r1.ebuild 6599
+RMD160 b67734f7e34928bc4aac569fe012f2d087161b15 firebird-2.0.3.12981.0-r1.ebuild 6599
+SHA256 cac8a2a54b138fa6fbad8c32868d152888b9689c5adc377936fdfb760967ddbb firebird-2.0.3.12981.0-r1.ebuild 6599
EBUILD firebird-2.0.3.12981.0.ebuild 7124 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c SHA1 56323977522ceae064b4ad5e375e0571cfae441d SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684
MD5 ec533a35b8eadb0b72fea0b55e2400a5 firebird-2.0.3.12981.0.ebuild 7124
RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c firebird-2.0.3.12981.0.ebuild 7124
SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684 firebird-2.0.3.12981.0.ebuild 7124
-MISC ChangeLog 12769 RMD160 37715963c6e2f6e3f33a6c0720d3d541badd5ae6 SHA1 4caac45be05f8c1b56502c0b054fa33c772098d4 SHA256 4fa15480190b7c1451e7cae8c1c399291ab5da8799206a62c91bc28473c1e3c0
-MD5 21a65ed9714a737e738379d2b6fceaed ChangeLog 12769
-RMD160 37715963c6e2f6e3f33a6c0720d3d541badd5ae6 ChangeLog 12769
-SHA256 4fa15480190b7c1451e7cae8c1c399291ab5da8799206a62c91bc28473c1e3c0 ChangeLog 12769
-MISC metadata.xml 676 RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 SHA1 c4a3ff2cb0dca7f10616bcb6380478fc9b030cf5 SHA256 8b013a783e48791968505c98397ff8777960cdd69f7818b3cff689fa1b2373a8
-MD5 d6677dccf2b721741683d19348632bd6 metadata.xml 676
-RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 metadata.xml 676
-SHA256 8b013a783e48791968505c98397ff8777960cdd69f7818b3cff689fa1b2373a8 metadata.xml 676
+MISC ChangeLog 13367 RMD160 947f9556c1779c702a8239ed1b34f1c7f207b320 SHA1 6055b4aa43f6116122966e8d2eb5e0dee6907548 SHA256 6d4f6cbe5553369b5bbdeb64d4695aa50274bb7678e81fe187e50a9cece1e6b3
+MD5 e134ec9c3cea313a5ad0603944193507 ChangeLog 13367
+RMD160 947f9556c1779c702a8239ed1b34f1c7f207b320 ChangeLog 13367
+SHA256 6d4f6cbe5553369b5bbdeb64d4695aa50274bb7678e81fe187e50a9cece1e6b3 ChangeLog 13367
+MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
+MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
+RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
+SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63 metadata.xml 611
MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r3 1048
RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r3 1048
SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r3 1048
-MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r4 506
-RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r4 506
-SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r4 506
-MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r5 506
-RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r5 506
-SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r5 506
MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0 506
RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0 506
SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0 506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG7Tr2KhnDs22gwa8RAqllAJ43JPy8KtZXcsf89o4Haz9d05585ACfcmGm
-lzg+oSDuIRGtZw7uFjeC5EM=
-=39GZ
------END PGP SIGNATURE-----
+MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r1 506
+RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r1 506
+SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r1 506
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
deleted file mode 100644
index 04a90efef089..000000000000
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9f16b202478eb3b287f70c87f9482308 Firebird-2.0.1.12855-0.tar.bz2 12582690
-RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f Firebird-2.0.1.12855-0.tar.bz2 12582690
-SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e Firebird-2.0.1.12855-0.tar.bz2 12582690
-MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
-RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
-SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
deleted file mode 100644
index 04a90efef089..000000000000
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9f16b202478eb3b287f70c87f9482308 Firebird-2.0.1.12855-0.tar.bz2 12582690
-RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f Firebird-2.0.1.12855-0.tar.bz2 12582690
-SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e Firebird-2.0.1.12855-0.tar.bz2 12582690
-MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
-RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
-SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r1 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r1
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r1
@@ -0,0 +1,6 @@
+MD5 9a28587a596a149eb01f006be1cb2ddb Firebird-2.0.3.12981-0.tar.bz2 12623689
+RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 Firebird-2.0.3.12981-0.tar.bz2 12623689
+SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e Firebird-2.0.3.12981-0.tar.bz2 12623689
+MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
+RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
+SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch b/dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch
deleted file mode 100644
index 3de90c0bc40d..000000000000
--- a/dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/Makefile.in.firebird
-+++ firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-@@ -186,10 +186,10 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/m
- #
-
- external_libraries:
-- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--ifeq ($(EDITLINE_FLG),Y)
-- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
-+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-+#ifeq ($(EDITLINE_FLG),Y)
-+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-+#endif
-
- #---------------------------------------------------------------------------
- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
-Index: firebird-2.0.0.12748/configure.in
-===================================================================
---- firebird-2.0.0.12748.orig/configure.in
-+++ firebird-2.0.0.12748/configure.in
-@@ -445,7 +445,7 @@
- AC_CHECK_LIB(termcap, tgetent, , \
- AC_CHECK_LIB(tinfo, tgetent, , \
- AC_MSG_ERROR(termcap support not found)))))
-- AC_SUBST(EDITLINE_A, -leditline)
-+ AC_SUBST(EDITLINE_A, -ledit)
- fi
- AC_CHECK_LIB(stdc++, main,,, $LIBS)
-
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -33,7 +33,7 @@
-
-
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
--CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
-+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
-
- ifeq ($(IsProdTypeBuild),Y)
- CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
diff --git a/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch b/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch
deleted file mode 100644
index 6369727aa0a7..000000000000
--- a/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/make.shared.targets
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.shared.targets
-+++ firebird-2.0.0.12748/builds/posix/make.shared.targets
-@@ -57,7 +57,7 @@ $(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/
-
- # gpre_meta needs a special boot build since there is no database.
-
--$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
-
-
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -103,19 +103,19 @@ DSQL_GPRE_FLAGS = -lang_internal -r -m
-
- .SUFFIXES: .c .e .epp .cpp
-
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-
-
--.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-
-
--$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
-
-
--$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
- $(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
-
-
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch
new file mode 100644
index 000000000000..1e8624b1108b
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch
@@ -0,0 +1,230 @@
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp
+--- Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp 2007-09-20 19:26:44.000000000 -0400
+@@ -29,7 +29,7 @@
+
+ typedef Firebird::PathName string;
+
+-const char* ALIAS_FILE = "aliases.conf";
++const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
+
+ bool ResolveDatabaseAlias(const string& alias, string& database)
+ {
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h Firebird-2.0.3.12981-0/src/jrd/file_params.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/file_params.h 2007-09-20 18:48:00.000000000 -0400
+@@ -38,17 +38,17 @@
+ const int EVENT_SEMAPHORES = 1;
+
+ #ifdef NOHOSTNAME
+-static const char* EVENT_FILE = "isc_event1";
+-static const char* LOCK_FILE = "isc_lock1.gbl";
+-static const char* LOCK_HEADER = "isc_config";
+-static const char* INIT_FILE = "isc_init1";
+-static const char* GUARD_FILE = "isc_guard1";
++static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1";
++static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.gbl";
++static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE = "../../../var/run/firebird/isc_init1";
++static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1";
+ #elif defined(SMALL_FILE_NAMES)
+-static const char* EVENT_FILE = "isce1.%s";
+-static const char* LOCK_FILE = "iscl1.%s";
+-static const char* LOCK_HEADER = "isc_config";
+-static const char* INIT_FILE = "isci1.%s";
+-static const char* GUARD_FILE = "iscg1.%s";
++static const char* EVENT_FILE = "../../../var/run/firebird/isce1.%s";
++static const char* LOCK_FILE = "../../../var/run/firebird/iscl1.%s";
++static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE = "../../../var/run/firebird/isci1.%s";
++static const char* GUARD_FILE = "../../../var/run/firebird/iscg1.%s";
+ #elif defined(VMS)
+ static const char* EVENT_FILE = "[000000]isc_event1.%s";
+ static const char* LOCK_FILE = "[000000]isc_lock1.%s";
+@@ -62,11 +62,11 @@
+ static const char* INIT_FILE = "%s.int";
+ static const char* GUARD_FILE = "%s.grd";
+ #else
+-static const char* EVENT_FILE = "isc_event1.%s";
+-static const char* LOCK_FILE = "isc_lock1.%s";
+-static const char* LOCK_HEADER = "isc_config";
+-static const char* INIT_FILE = "isc_init1.%s";
+-static const char* GUARD_FILE = "isc_guard1.%s";
++static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1.%s";
++static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.%s";
++static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE = "../../../var/run/firebird/isc_init1.%s";
++static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1.%s";
+ #endif
+
+ #ifdef sun
+@@ -97,7 +97,7 @@
+ static const char* MSG_FILE = "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX = 10;
+-static const char* LOGFILE = "firebird.log";
++static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
+ #define TEMP_PATTERN "_XXXXXX"
+ #elif defined(WIN_NT)
+ static const char* WORKFILE = "c:\\temp\\";
+@@ -139,7 +139,7 @@
+ static const char* MSG_FILE = "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX = 10;
+-static const char* LOGFILE = "firebird.log";
++static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
+ #define TEMP_PATTERN "_XXXXXX"
+ #endif
+
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h 2007-09-20 18:48:18.000000000 -0400
+@@ -58,7 +58,7 @@
+ #ifdef VMS
+ "[sysmgr]security2.fdb";
+ #else
+- "security2.fdb";
++ "../../../etc/firebird/security2.fdb";
+ #endif
+
+ gds__prefix(path_buffer, USER_INFO_NAME);
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/os/config_root.h Firebird-2.0.3.12981-0/src/jrd/os/config_root.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/os/config_root.h 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/os/config_root.h 2007-09-20 18:48:36.000000000 -0400
+@@ -32,7 +32,7 @@
+ #include "../jrd/os/path_utils.h"
+ #include "../common/utils_proto.h"
+
+-static const char* CONFIG_FILE = "firebird.conf";
++static const char* CONFIG_FILE = "../../../etc/firebird/firebird.conf";
+
+ /**
+ Since the original (isc.cpp) code wasn't able to provide powerful and
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/svc.cpp Firebird-2.0.3.12981-0/src/jrd/svc.cpp
+--- Firebird-2.0.3.12981-0_orig/src/jrd/svc.cpp 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/svc.cpp 2007-09-20 19:34:33.000000000 -0400
+@@ -366,38 +366,38 @@
+ static serv_entry services[] =
+ {
+
+- { isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 },
+- { isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 },
+- { isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 },
+- { isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 },
+- { isc_action_max, "backup", "-svc -b", "bin/gbak", MAIN_GBAK, 0 },
+- { isc_action_max, "create", "-svc -c", "bin/gbak", MAIN_GBAK, 0 },
+- { isc_action_max, "restore", "-svc -r", "bin/gbak", MAIN_GBAK, 0 },
+- { isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 },
+- { isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 },
+- { isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 },
+- { isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 },
+- { isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 },
+- { isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++ { isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 },
++ { isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 },
++ { isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 },
++ { isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 },
++ { isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
++ { isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
++ { isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
++ { isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 },
++ { isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 },
++ { isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 },
++ { isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 },
++ { isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 },
++ { isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "query_server", NULL, NULL, NULL, 0 },
+- { isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 },
+- { isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 },
+- { isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++ { isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 },
++ { isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 },
++ { isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "anonymous", NULL, NULL, NULL, 0 },
+
+ /* NEW VERSION 2 calls, the name field MUST be different from those names above
+ */
+ { isc_action_max, "service_mgr", NULL, NULL, NULL, 0 },
+- { isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
+- { isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
+- { isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", MAIN_GFIX, 0 },
+- { isc_action_svc_add_user, "Add User", NULL, "bin/gsec", MAIN_GSEC, 0 },
+- { isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", MAIN_GSEC, 0 },
+- { isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", MAIN_GSEC, 0 },
+- { isc_action_svc_display_user, "Display User", NULL, "bin/gsec", MAIN_GSEC, 0 },
+- { isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", MAIN_GFIX, 0 },
+- { isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print", TEST_THREAD, 0 },
+- { isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat", MAIN_GSTAT, 0 },
++ { isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
++ { isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
++ { isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
++ { isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
++ { isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
++ { isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
++ { isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
++ { isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
++ { isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print", TEST_THREAD, 0 },
++ { isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat", MAIN_GSTAT, 0 },
+ { isc_action_svc_get_fb_log, "Get Log File", NULL, NULL, SVC_read_fb_log, 0 },
+ /* actions with no names are undocumented */
+ { isc_action_svc_set_config, NULL, NULL, NULL, TEST_THREAD, 0 },
+diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp 2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp 2007-09-20 18:49:23.000000000 -0400
+@@ -1335,7 +1335,7 @@
+ bool CFBDialog::UpdateFirebirdConf(CString option, CString value)
+ {
+ CStdioFile FbConfFile, FbConfFileNew;
+- CString FirebirdConfFilename = m_Root_Path + "firebird.conf";
++ CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf";
+ CString FirebirdConfNewname = FirebirdConfFilename + ".new";
+ CString FirebirdConfOldname = FirebirdConfFilename + ".old";
+ CString FirebirdConfLine = "";
+diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/gsec/security.epp Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/gsec/security.epp 2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp 2007-09-20 18:49:55.000000000 -0400
+@@ -41,7 +41,7 @@
+ #endif
+ #include "../common/utils_proto.h"
+
+-DATABASE DB = STATIC FILENAME "security2.fdb";
++DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb";
+
+ static const char* SYSDBA_USER_NAME = "SYSDBA";
+
+diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/guard/guard.cpp Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/guard/guard.cpp 2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp 2007-09-20 19:33:31.000000000 -0400
+@@ -51,7 +51,7 @@
+ const USHORT IGNORE = 3;
+ const USHORT NORMAL_EXIT= 0;
+
+-const char* SUPER_SERVER_BINARY = "bin/fbserver";
++const char* SUPER_SERVER_BINARY = "../../../usr/bin/fbserver";
+
+ const char* INTERBASE_USER = "interbase";
+ const char* FIREBIRD_USER = "firebird";
+diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h
+--- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h 2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h 2007-09-20 19:33:06.000000000 -0400
+@@ -31,7 +31,7 @@
+ static const char* FIREBIRD_USER_NAME = "firebird";
+ static const char* INTERBASE_USER_NAME = "interbase";
+ static const char* INTERBASE_USER_SHORT= "interbas";
+-static const char* SERVER_GUARDIAN = "bin/fbguard";
++static const char* SERVER_GUARDIAN = "../../../usr/bin/fbguard";
+
+ const USHORT MSG_FAC = 18;
+ const int MSG_LEN = 128;
+diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp 2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp 2007-09-19 21:29:15.000000000 -0400
+@@ -271,7 +271,7 @@
+ rs = "can not quit now, use shut -ign";
+ break;
+ case MSG_STARTERR:
+- rs = "check $FIREBIRD/firebird.log file for errors";
++ rs = "check /var/log/firebird/firebird.log file for errors";
+ break;
+ case MSG_STARTFAIL:
+ rs = "can not start server";
diff --git a/dev-db/firebird/files/firebird.conf.d.2 b/dev-db/firebird/files/firebird.conf.d.2
new file mode 100644
index 000000000000..b386f60bd8aa
--- /dev/null
+++ b/dev-db/firebird/files/firebird.conf.d.2
@@ -0,0 +1,4 @@
+ISC_USER=SYSDBA
+ISC_PASSWORD=masterke
+FIREBIRD=/usr/share/firebird
+FBRunUser=firebird
diff --git a/dev-db/firebird/files/firebird.init.d.2 b/dev-db/firebird/files/firebird.init.d.2
new file mode 100644
index 000000000000..0bedf82511c1
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.2
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d.2,v 1.1 2007/09/21 02:15:04 wltjr Exp $
+
+
+# NOTE: make sure you have localhost in your hosts.equiv file see next 2
+# lines for example of hosts.equiv contents
+#localhost.localdomain
+#localhost
+
+
+export FIREBIRD
+export ISC_USER
+export ISC_PASSWORD
+export FBRunUser
+MANAGER=/usr/bin/fbmgr.bin
+
+depend() {
+ need net
+}
+
+start(){
+ ebegin "Starting Firebird server"
+ su $FBRunUser -c "${MANAGER} -start -forever"
+ eend $?
+}
+
+stop(){
+ ebegin "Stopping Firebird server"
+ $MANAGER -shut
+ eend $?
+}
diff --git a/dev-db/firebird/files/firebird.xinetd.2 b/dev-db/firebird/files/firebird.xinetd.2
new file mode 100644
index 000000000000..01fc102ee3a8
--- /dev/null
+++ b/dev-db/firebird/files/firebird.xinetd.2
@@ -0,0 +1,11 @@
+service gds_db
+{
+ flags = REUSE
+ socket_type = stream
+ wait = no
+ user = firebird
+ log_on_success += USERID
+ log_on_failure += USERID
+ server = /usr/bin/fb_inet_server
+ disable = yes
+}
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild
deleted file mode 100644
index c05c10554caa..000000000000
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild,v 1.4 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit flag-o-matic eutils autotools versionator
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
- doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="amd64 -ia64 x86"
-IUSE="doc xinetd examples debug"
-RESTRICT="userpriv"
-
-RDEPEND="dev-libs/libedit
- dev-libs/icu"
-DEPEND="${RDEPEND}
- doc? ( app-arch/unzip )"
-RDEPEND="${RDEPEND}
- xinetd? ( virtual/inetd )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup firebird 450
- enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-src_unpack() {
- if use doc; then
- # Unpack docs
- mkdir "${WORKDIR}/manuals"
- cd "${WORKDIR}/manuals"
- unpack ib_b60_doc.zip
- cd "${WORKDIR}"
- fi
-
- unpack "${MY_P}.tar.bz2"
-
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-external-libs.patch"
- epatch "${FILESDIR}/${P}-make-deps.patch"
- find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
- rm -rf "${S}"/extern/{editline,icu}
-
- eautoreconf
-}
-
-src_compile() {
- filter-flags -fprefetch-loop-arrays
- filter-mfpmath sse
-
- econf \
- --prefix=/opt/firebird --with-editline \
- $(use_enable !xinetd superserver) \
- $(use_enable debug) \
- ${myconf} || die "econf failed"
- emake -j1 || die "error during make"
-}
-
-src_install() {
- cd "${S}/gen/firebird"
-
- if use examples; then
- docinto examples
- dodoc examples/*
- fi
-
- into /opt/firebird
- dobin bin/*
- dolib.so lib/*.so*
- dolib.a lib/*.a*
-
- insinto /opt/firebird
- doins *.msg
-
- rm -rf "${D}"/opt/firebird/bin/*.sh
- dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
- insinto /opt/firebird/include
- doins include/*
-
- insinto /opt/firebird/help
- doins help/help.fdb
-
- insinto /etc/firebird
- insopts -m0644 -o firebird -g firebird
- doins misc/*
- doins ../install/misc/aliases.conf
- insopts -m0660 -o firebird -g firebird
- doins security2.fdb
-
- exeinto /opt/firebird/UDF
- doexe UDF/*.so
- exeinto /opt/firebird/intl
- doexe intl/*.so
- newexe intl/libfbintl.so fbintl
-
- diropts -m 755 -o firebird -g firebird
- dodir /var/log/firebird
- dodir /var/run/firebird
- keepdir /var/log/firebird
- keepdir /var/run/firebird
-
- touch "${D}"/var/log/firebird/firebird.log
- chown firebird:firebird "${D}"/var/log/firebird/firebird.log
-
- # create links for split config & log file
- dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
- dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
- dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
- dosym /etc/firebird/fbintl.conf /opt/firebird/intl/fbintl.conf
- dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
-
- local my_lib=$(get_libdir)
-
- # firebird has a problem with lib64 dir name, bug?
- if [ ${my_lib} == "lib64" ] ; then
- dosym ./lib64 /opt/firebird/lib
- fi
-
- # create links for backwards compatibility dosym puts link in / :(
- cd "${D}/opt/firebird/${my_lib}/"
- ln -s libfbclient.so libgds.so
- ln -s libfbclient.so libgds.so.0
- ln -s libfbclient.so libfbclient.so.1
-
- # create system links for ld
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
- dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
- dosym ../../opt/firebird/${my_lib}/libfbclient.so.2 /usr/${my_lib}/libfbclient.so.2
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed"
- else
- newinitd "${FILESDIR}/${PN}.init.d" ${PN}
- newconfd "${FILESDIR}/firebird.conf.d" ${PN}
- fperms 640 /etc/conf.d/firebird
- fi
- doenvd "${FILESDIR}/70${PN}"
-
- # Install docs
- use doc && dodoc "${WORKDIR}"/manuals/*
-}
-
-pkg_postinst() {
- # Hack to fix ownership/perms
- chown -fR firebird:firebird /etc/firebird /opt/firebird
- chmod 750 /etc/firebird
-
- elog
- elog "1. If haven't done so already, please run:"
- elog
- elog " \"emerge --config =${PF}\""
- elog
- elog " to create lockfiles, set permissions and more"
- elog
- elog "2. Firebird now runs with it's own user. Please remember to"
- elog " set permissions to firebird:firebird on databases you "
- elog " already have (if any)."
- elog
-
- if ! use xinetd
- then
- elog "3. You've built the stand alone deamon version,"
- elog " SuperServer. If you were using pre 1.5.0 ebuilds"
- elog " you're probably have one installed via xinetd. please"
- elog " remember to disable it (usually in /etc/xinetd.d/firebird),"
- elog " since the current one has it's own init script under"
- elog " /etc/init.d"
- fi
-}
-
-pkg_config() {
- cd /opt/firebird
-
- # Create Lock files
- for i in isc_init1 isc_lock1 isc_event1
- do
- FileName=$i.`hostname`
- touch $FileName
- chown firebird:firebird $FileName
- chmod ug=rw,o= $FileName
- done
-
- # if found /etc/security.gdb from previous install, backup, and restore as
- # /etc/security2.fdb
- if [ -f /etc/firebird/security.gdb ]
- then
- # if we have scurity2.fdb already, back it 1st
- if [ -f /etc/firebird/security2.fdb ]
- then
- cp /etc/firebird/security2.fdb /etc/firebird/security2.fdb.old
- fi
- gbak -B /etc/firebird/security.gdb /etc/firebird/security.gbk
- gbak -R /etc/firebird/security.gbk /etc/firebird/security2.fdb
- mv /etc/firebird/security.gdb /etc/firebird/security.gdb.old
- rm /etc/firebird/security.gbk
-
- # make sure they are readable only to firebird
- chown firebird:firebird /etc/firebird/{security.*,security2.*}
- chmod 660 /etc/firebird/{security.*,security2.*}
-
- einfo
- 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 /etc/firebird)."
- einfo
- fi
-
- # we need to enable local access to the server
- if [ ! -f /etc/hosts.equiv ]
- then
- touch /etc/hosts.equiv
- chown root:0 /etc/hosts.equiv
- chmod u=rw,go=r /etc/hosts.equiv
- fi
-
- # add 'localhost.localdomain' to the hosts.equiv file...
- if grep -q 'localhost.localdomain$' /etc/hosts.equiv 2>/dev/null; then
- echo "localhost.localdomain" >> /etc/hosts.equiv
- einfo "Added localhost.localdomain to /etc/hosts.equiv"
- fi
-
- # add 'localhost' to the hosts.equiv file...
- if grep -q 'localhost$' /etc/hosts.equiv 2>/dev/null; then
- echo "localhost" >> /etc/hosts.equiv
- einfo "Added localhost to /etc/hosts.equiv"
- fi
-
- HS_NAME=`hostname`
- if grep -q ${HS_NAME} /etc/hosts.equiv 2>/dev/null; then
- echo "${HS_NAME}" >> /etc/hosts.equiv
- einfo "Added ${HS_NAME} to /etc/hosts.equiv"
- fi
-
- einfo "If you're using UDFs, please remember to move them"
- einfo "to /opt/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild
index c47d48fca522..8b7ce35bebc7 100644
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild,v 1.2 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild,v 1.1 2007/09/21 02:15:03 wltjr Exp $
inherit flag-o-matic eutils autotools versionator
@@ -8,8 +8,9 @@ MY_P=Firebird-$(replace_version_separator 4 -)
DESCRIPTION="A relational database offering many ANSI SQL-99 features"
HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
- doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+#SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+SRC_URI="http://www.firebirdsql.org/download/prerelease/source/${MY_P}.tar.bz2
+ doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
LICENSE="Interbase-1.0"
SLOT="0"
@@ -28,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup firebird 450
- enewuser firebird 450 /bin/bash /opt/firebird firebird
+ enewuser firebird 450 /bin/bash /usr/share/firebird firebird
}
src_unpack() {
@@ -42,13 +43,23 @@ src_unpack() {
unpack "${MY_P}.tar.bz2"
+ mkdir -p "${WORKDIR}/../etc" \
+ "${WORKDIR}/usr" \
+ "${WORKDIR}/var/log/firebird" \
+ "${WORKDIR}/var/run/firebird"
+ cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin"
+ cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird
+
cd "${S}"
epatch "${FILESDIR}/${P}-external-libs.patch"
epatch "${FILESDIR}/${P}-make-deps.patch"
+ epatch "${FILESDIR}/${P}-paths.patch"
+
find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
rm -rf "${S}"/extern/{editline,icu}
+
eautoreconf
}
@@ -57,7 +68,7 @@ src_compile() {
filter-mfpmath sse
econf \
- --prefix=/opt/firebird --with-editline \
+ --prefix=/usr/share/firebird --with-editline \
$(use_enable !xinetd superserver) \
$(use_enable debug) \
${myconf} || die "econf failed"
@@ -72,24 +83,28 @@ src_install() {
dodoc examples/*
fi
- into /opt/firebird
+# Seems to be ignored?
+# insinto /usr/share/firebird/bin
+# dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+ rm bin/*.sh || die "Could not remove *sh files"
+
+ insinto /usr/bin
dobin bin/*
+
+ insinto /usr/include
+ doins include/*
+
+ insinto /usr/lib
dolib.so lib/*.so*
dolib.a lib/*.a*
- insinto /opt/firebird
+ insinto /usr/share/firebird
doins *.msg
- rm -rf "${D}"/opt/firebird/bin/*.sh
- dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
- insinto /opt/firebird/include
- doins include/*
-
- insinto /opt/firebird/help
+ insinto /usr/share/firebird/help
doins help/help.fdb
- insinto /opt/firebird/upgrade
+ insinto /usr/share/firebird/upgrade
doins "${S}"/src/misc/upgrade/v2/*
insinto /etc/firebird
@@ -99,9 +114,10 @@ src_install() {
insopts -m0660 -o firebird -g firebird
doins security2.fdb
- exeinto /opt/firebird/UDF
+ exeinto /usr/share/firebird/UDF
doexe UDF/*.so
- exeinto /opt/firebird/intl
+
+ exeinto /usr/share/firebird/intl
doexe intl/*.so
newexe intl/libfbintl.so fbintl
@@ -111,42 +127,18 @@ src_install() {
keepdir /var/log/firebird
keepdir /var/run/firebird
- touch "${D}"/var/log/firebird/firebird.log
- chown firebird:firebird "${D}"/var/log/firebird/firebird.log
-
- # create links for split config & log file
- dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
- dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
- dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
- dosym /etc/firebird/fbintl.conf /opt/firebird/intl/fbintl.conf
- dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
-
- local my_lib=$(get_libdir)
-
- # firebird has a problem with lib64 dir name, bug?
- if [ ${my_lib} == "lib64" ] ; then
- dosym ./lib64 /opt/firebird/lib
- fi
-
- # create links for backwards compatibility dosym puts link in / :(
- cd "${D}/opt/firebird/${my_lib}/"
+ # create links for backwards compatibility
+ cd "${D}/usr/lib"
ln -s libfbclient.so libgds.so
ln -s libfbclient.so libgds.so.0
ln -s libfbclient.so libfbclient.so.1
- # create system links for ld
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
- dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
- dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
- dosym ../../opt/firebird/${my_lib}/libfbclient.so.2 /usr/${my_lib}/libfbclient.so.2
-
if use xinetd ; then
insinto /etc/xinetd.d
- newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed"
+ newins "${S}/gen/install/misc/${PN}.xinetd.2" "${PN}" || die "newins xinetd file failed"
else
- newinitd "${FILESDIR}/${PN}.init.d" ${PN}
- newconfd "${FILESDIR}/firebird.conf.d" ${PN}
+ newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
+ newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}
fperms 640 /etc/conf.d/firebird
fi
doenvd "${FILESDIR}/70${PN}"
@@ -157,43 +149,41 @@ src_install() {
pkg_postinst() {
# Hack to fix ownership/perms
- chown -fR firebird:firebird /etc/firebird /opt/firebird
+ chown -fR firebird:firebird /etc/firebird /usr/share/firebird
chmod 750 /etc/firebird
elog
- elog "1. If haven't done so already, please run:"
- elog
- elog " \"emerge --config =${PF}\""
- elog
- elog " to create lockfiles, set permissions and more"
- elog
- elog "2. Firebird now runs with it's own user. Please remember to"
- elog " set permissions to firebird:firebird on databases you "
- elog " already have (if any)."
+ elog "Firebird is no longer installed in /opt. Binaries are in"
+ elog "/usr/bin. The core, udfs, etc are in /usr/share/firebird. Logs"
+ elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+ elog "Please report any problems or issues to bugs.gentoo.org."
elog
- if ! use xinetd
- then
- elog "3. You've built the stand alone deamon version,"
- elog " SuperServer. If you were using pre 1.5.0 ebuilds"
- elog " you're probably have one installed via xinetd. please"
- elog " remember to disable it (usually in /etc/xinetd.d/firebird),"
- elog " since the current one has it's own init script under"
- elog " /etc/init.d"
- fi
+# elog
+# elog "1. If haven't done so already, please run:"
+# elog
+# elog " \"emerge --config =${PF}\""
+# elog
+# elog " to create lockfiles, set permissions and more"
+# elog
+# elog "2. Firebird now runs with it's own user. Please remember to"
+# elog " set permissions to firebird:firebird on databases you "
+# elog " already have (if any)."
+# elog
+#
+# if ! use xinetd
+# then
+# elog "3. You've built the stand alone deamon version,"
+# elog " SuperServer. If you were using pre 1.5.0 ebuilds"
+# elog " you're probably have one installed via xinetd. please"
+# elog " remember to disable it (usually in /etc/xinetd.d/firebird),"
+# elog " since the current one has it's own init script under"
+# elog " /etc/init.d"
+# fi
}
pkg_config() {
- cd /opt/firebird
-
- # Create Lock files
- for i in isc_init1 isc_lock1 isc_event1
- do
- FileName=$i.`hostname`
- touch $FileName
- chown firebird:firebird $FileName
- chmod ug=rw,o= $FileName
- done
+ cd /usr/share/firebird
# if found /etc/security.gdb from previous install, backup, and restore as
# /etc/security2.fdb
@@ -245,5 +235,5 @@ pkg_config() {
fi
einfo "If you're using UDFs, please remember to move them"
- einfo "to /opt/firebird/UDF"
+ einfo "to /usr/share/firebird/UDF"
}
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 6398955923bd..29bc6a792b7b 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -5,10 +5,6 @@
<herd>no-herd</herd>
<maintainer>
- <email>drizzt@gentoo.org</email>
- </maintainer>
-
- <maintainer>
<email>wltjr@gentoo.org</email>
</maintainer>