diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-09-07 13:09:12 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-09-07 13:09:12 +0000 |
| commit | 45425e64d680ddf2f45258066e543b19413237ca (patch) | |
| tree | bf2d4feb78b365166d750c073f2bb13a49c8560d | |
| parent | Remove masked for removal versions (diff) | |
| download | historical-45425e64d680ddf2f45258066e543b19413237ca.tar.gz historical-45425e64d680ddf2f45258066e543b19413237ca.tar.bz2 historical-45425e64d680ddf2f45258066e543b19413237ca.zip | |
Remove vulnerable versions, move to maintainer-needed (#460780)
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
18 files changed, 25 insertions, 2313 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index 7d2fd37a0058..8272e14942ca 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for dev-db/firebird # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.115 2014/05/30 12:58:22 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.116 2014/09/07 13:09:10 pacho Exp $ + + 07 Sep 2014; Pacho Ramos <pacho@gentoo.org> + -files/firebird-2.0.3.12981.0-CVE-2008-0387.patch, + -files/firebird-2.0.3.12981.0-CVE-2008-0467.patch, + -files/firebird-2.0.3.12981.0-external-libs.patch, + -files/firebird-2.0.3.12981.0-flags.patch, + -files/firebird-2.0.3.12981.0-make-deps.patch, + -files/firebird-2.1.2.18118.0-deps-flags-libs.patch, + -files/firebird-2.1.2.18118.0-gcc-icu-declare.patch, + -files/firebird-2.5.0.26074.0-build.patch, + -files/firebird-2.5.0.26074.0-client.patch, + -files/firebird-2.5.0.26074.0-deps-flags-libs.patch, + -files/firebird-2.5.0.26074.0-deps-flags.patch, + -files/firebird-2.5.0.26074.0-superclassic.patch, + -firebird-2.0.3.12981.0-r6.ebuild, -firebird-2.1.3.18185.0-r1.ebuild, + -firebird-2.5.2.26539.0.ebuild, metadata.xml: + Remove vulnerable versions, move to maintainer-needed (#460780) *firebird-2.5.2.26540.0 (30 May 2014) diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index a870d5d274a5..4545e2113ca8 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -2,19 +2,7 @@ Hash: SHA256 AUX 70firebird 50 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 SHA512 0c2f7929331e786bd8f63c23d77e2e39c2217b3c36596661b9976016f7eb72ada465e312cc6ec6326615dcd3f684eb4ba5a1fb408528958351fa8ebdcb97a4bf WHIRLPOOL 560f8edb6681fbfcf0ac43ba49b2481eb4fdecaeef6c4607518ae97c25728c92dc910b173ccbafc1248e5e128bd6aaa184791ce747373771ffd82f315de44575 -AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b SHA512 cc39107f1b2f83dbcb2db3d99f6756f7b0e9466692e760610e0d4e36f8954ec7d722ffedee1c7c2a161b38ab929c0da7d1ee95e1d03443310d08e51192084fac WHIRLPOOL 48e421b5fee36d01f999f916fd9b999bbd44f106c5c7203cf1e720e0670e62fee825011e86396aafb0556093320da4e13016ba47a23c94c206cdd2e65c39118f -AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05 SHA512 bcbda4c314cc21606e6d2526ecc8ad72496a7443a717f9470a7c1c29bda3b82ec976b6dd4ce3106972a3cc811de8de93fa4178ba71007da001b908f8212602a7 WHIRLPOOL 7cd02869b228a483ebcd995014424b75010607b5179ce43fc11029499ad80a5025e5ee17b01778bc78ef13f8daef5090c531895094143fa99ddf34720756e7a6 -AUX firebird-2.0.3.12981.0-external-libs.patch 1891 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da SHA512 0f76a27ec57525797c9e9d31fc8ba9609ca9da72c10a481199889c55b678eacef35a78cdd017532b6838467d41e9f1be0dd187d75aec11510049a12e4fb08fff WHIRLPOOL 3ebe8622d0213d33d825ca3d3cb27badde67636daf50274e89c0780d58d8c76a9535e2443b2fee539ed49d870e05935460653cb6419e308db1ce38d712f34f42 -AUX firebird-2.0.3.12981.0-flags.patch 960 SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045 SHA512 984e5a5120275e3a8ce731738045b1f7a748cdcc8fb83bb83d1badc3aa7b541c2ecd0cb35892a2477a1f7df03d465fdb26a56c870b1c0f59afb66be229b574a4 WHIRLPOOL 9dc544338ad933952489b15daf2f2683d0bca1e9262d89970371d374660dbc79f3a1661ee19b22c67000d5739274fe7196f5a056872a209604c94a907a083554 -AUX firebird-2.0.3.12981.0-make-deps.patch 1369 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb SHA512 e92b49fd55164402b432c75c52c95d5ba1564ebc8b79d3fb0f829a47451e81b3a6abf891eba280290ecd12df8f1551e3884d76e241e5940ff41b2c2cb3926cf4 WHIRLPOOL e95698cba4d1d2842402143f5c2a60733a6e78ac0f26cdab9fa95d466ec5ce42ca67af50a551202b78f8f5d08bd77fe2c4df76760a698207b5389fec5a48f189 -AUX firebird-2.1.2.18118.0-deps-flags-libs.patch 4508 SHA256 730189d644dc2a41e3f54839535ad3b84f4af9d02ee6064226175b5ee6aecdb9 SHA512 e27a2dc1268774df043ef28ebf1e0f17a5fd5b8c98c59ce4d72ca12d96187b778218df40c43d1e86f0a43b8321aa5fb20845e072e73604c9d1b86991f1aff2b9 WHIRLPOOL 193d9e6058fb8014f6f6f620eb4937907904165f62644642bbd61297ec3ab848093bfa5769c8acb9f76f16fd39c164932a33df6a09d2c5afb8c0c2767ef0258b -AUX firebird-2.1.2.18118.0-gcc-icu-declare.patch 537 SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339 SHA512 dd52ae889e59cce7e6063638265b22a33840ab14fbdf2f54451147cdebc19a005c666fb51362483ce1a939c12fa49c3ecf2ef9ab757b29a36d6070c54d76a367 WHIRLPOOL 880cb5b36b98e01012c8357239163de7ddf34a313f165c1929283819806016dbb336eb65b453c5fae7abb1d671c69d7f63523d6d1c53274645bb26e289a9a7f9 AUX firebird-2.5.0.26074.0-Makefile.in.static.createdb 2034 SHA256 9bfd82823c46be6e213cd8bbad97e05c933640b6023b957fdf5d813b7cd5dd14 SHA512 c4b8b03a9aeb0c640dc42522adb7d5dbbdac0f0d692f1f440577f54adf6633ed0f9190b24c40557484e683cc5a4322757b805d01717119685244ff6f6938dec6 WHIRLPOOL d9d8111c0d459bb0ba7404054cf519a1330314779f51b806d68fb31e46cc5a22a755b4972cf0a6aa4fb4ab9b6ac58fb452974ba1f58b44ec9460db4210027f3f -AUX firebird-2.5.0.26074.0-build.patch 9533 SHA256 b1bf5562ea1bfa2b8f157d4e7166a032e3a0c1a180a50195cdf649d9d247ec0c SHA512 aae756eaf0623a214a56973252fe78d309449c08fefc4dc7ab084bc50f640e8645a15204086a81e8fae69a84d6873b84ab88caa26dc1d17b8ca488b2cf4dda1c WHIRLPOOL 6b2a9d321dcd46f84eac2bb886c0e475bf6f31e5e85cd1d5433713c2626389ab4a3aa0967efbe9678400967c3117acf0f0de396da015432eefd4023e7e05771b -AUX firebird-2.5.0.26074.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2 -AUX firebird-2.5.0.26074.0-deps-flags-libs.patch 6260 SHA256 1d64faf6d47291dbbc0d28f9d569b7b33a8737ab94ed6cd16230936bb1f97c31 SHA512 4aec4685ab5b5c1f65615c6874f12aa036618b9e5675da9a15e5efba1dd9203cc9fc02b35007e7018375aaeb68bec72da448972dc726f57d0c92268139137816 WHIRLPOOL 2d0fba8cb0add368fe3e03f0d09b1f877e5c68cc2ff0630e52c599a1da0fb30d0b8384d6e6f2a4ac0f850fbe5be061eb71f7f88dcdd92c5f668c8d0947cb6f52 -AUX firebird-2.5.0.26074.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204 -AUX firebird-2.5.0.26074.0-superclassic.patch 713 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb WHIRLPOOL eef1837adac86b7bc21f8e240b753398a787e4e108243004ca34b6015c842e7ca91ce584ffa4e85e1f2e908b5b2d5a3af5fa04125c110b13ffe43b5dca63c5d6 AUX firebird-2.5.1.26351.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2 AUX firebird-2.5.1.26351.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204 AUX firebird-2.5.1.26351.0-superclassic.patch 713 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb WHIRLPOOL eef1837adac86b7bc21f8e240b753398a787e4e108243004ca34b6015c842e7ca91ce584ffa4e85e1f2e908b5b2d5a3af5fa04125c110b13ffe43b5dca63c5d6 @@ -28,31 +16,15 @@ AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848 AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9 AUX firebird.xinetd.2 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9 AUX xinetd.2 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9 -DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e SHA512 feed7f72281ec5b4aa6b8902781a43c16c8d3349281e8fc636a6a6a77df592ce39bc757920847caad97d0148702937dce25830dc1e8a2b12045c3f310938b83f WHIRLPOOL 75c969486394d93bb37330c2c1a298be16f2de3bb3715039851d8b4cbe82787d497afc9441e8dbc1657633416b4919dae0c978386ed0bd2ea950e27ac0f505bb -DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 SHA256 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28 SHA512 806423287e1292eacd4f97447023e7fa39e44faf757d527086d62dcaba08326b7dff2afe2eb64a5a0bbb1bd68dd0fb7d22dca4898b058dafae21f255e1ef20bd WHIRLPOOL ab32a78d8ca33fab6db0ce8af371bbbb76fd3691c3b64e26a7973ba6daca7fe54b32570dd80008d5b3c6ab3489e5b5c05db292b0e6ebbd02f04ea91fba9ec247 -DIST Firebird-2.5.2.26539-0.tar.bz2 13708119 SHA256 6b90e5579f9dc3f527b7cf84ac869682aa9582a61f81c6288926c332a863abc8 SHA512 f3b3a8ec35202620bd6b35d5b1004a0d668b8d1a0a7c0864b40b9a7fb682e8b0d0f7b68fbbdc1ee8ace4602f1756103798a1ed8f4b8b14dfa921e06b81c10e8b WHIRLPOOL 669ac7b611dbe7badedc2c3cbf0d3d51b1555b7aaf7ed1bd48f1103e8c85304579411a40a5d29626580cb24eb40ba694639c8a02f98f715b16b0bb18f317c393 DIST Firebird-2.5.2.26540-0.tar.bz2 13805637 SHA256 bbb9a408198898818d5be3c301dde0f8524fd8e2f509662121d7393e02520721 SHA512 a057f78825bcfe992f9e079704621a1c659588a906e200ed56e269d0a3d78f968553146f21bde1b680795c760b896af1ec689f33dd293dbbc2242ba77b491b3c WHIRLPOOL eb14e30caff8ce1f8fee3651311ce1976ca5041d6c0d739eb916c33d6dc2d810cc10be66dfddf869b0a1dce3171c14ff2db393b5d4b0c0bdf8523d7e73c19606 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f -EBUILD firebird-2.0.3.12981.0-r6.ebuild 10001 SHA256 33d020154ad96d7326c45a6a197eaebdc85f8d576a21518a1ad4a9d9d8dcf5f2 SHA512 3d6bb0d531d3e7a36897e86d323492009dd9eca24ceb58fd6050b107ddae374608ac8e6cdd3055ea9df6dcfe4c1cff3c5af0d6e89879ef35fafbf57bf7e3f5f6 WHIRLPOOL dcd41814c6237b037c7aba7fc61110ff44a752bac679f289ad2b3ab79f51a12b8b3b62bb6d9255bfe885b795c64c722558b840db944f14553b5d09ebc61dc437 -EBUILD firebird-2.1.3.18185.0-r1.ebuild 10275 SHA256 74b84e73179ae743e7aebe42e4667124f74f8c362403330a3d0277456d4fc23c SHA512 0a0e4f2e081b9d0f11dcb67fc77b29efbdb8377d66eeb6ecd4c09e964a3ac180053c54c2fe2c530ec10b260d24cc66f697e551f8835c48420b14880f8e3dfe98 WHIRLPOOL aecf65fa3b5c8c35ebc9436d03344cb9a106912f069d85227b38a9d61cbc85edfb259651696b1632b9b002f09792a7afecef62fc9538a63e5d13ab9314536277 -EBUILD firebird-2.5.2.26539.0.ebuild 8950 SHA256 387d4ee5ec3506f5df3fa657695a285b99dffbe65baf660a58fbfbfa9a66b0c1 SHA512 4b1b015021f4fdd930b8d0eccc7efa46c4db006d9ded57c600e22c4c0118eed328d3c348fdf5a5f952109ee71791377acc84c208b3212f944b712e1ba09ca055 WHIRLPOOL f4da72ec863a9e4d0115fd7b18a8f0ad2dfddb824f14da0028a99ef64b064bc0cad64f596158e446fdbbc5bc960e784c4982fba0d3b07922c9cb36169430c6c7 EBUILD firebird-2.5.2.26540.0.ebuild 8947 SHA256 0c5f0a35930bf46d48fc6da7d3a2e8611c6842f35e4e9a40013f6a94eedffb74 SHA512 c445ff5242380aca7d521a1c099a02cbe29b8867b8a028fac92cacd367905948e40b04078040d9bf706bc76bc03728248888d714ca98088e63e811f6afcd09d0 WHIRLPOOL fa8d77c36465bad04eae253fdac75ed7e7148dfce6e3135c1a66fe9175f768d5934ad90dfd03079323c5746b251ef7098239f81afe5e7068c2b606e8f811d92e -MISC ChangeLog 25870 SHA256 c6263752da8429913df65b61799d15a841bd59b2837203b2b940c9047bd6f658 SHA512 3ff45f3848c4fd05ce10669e233a1db68518d9b331a332b6b238c9aea16ee451c372b3479053462f53cebd5c2ec1d4cd282c6e3fe92857bef8a8a406ad0023be WHIRLPOOL 82d93425e9c069aae7bd122bea55736f5a111c4a55d7fc6652a60299f2328bfbcd64083590a746ac93c962807dc90c8a8ad014d8a217bcf637c780eb83cac0c2 -MISC metadata.xml 1020 SHA256 7f42f4de8b12a9e43d885973743aea92783fbac0fa90e4fbff77cd9cbfcce6c5 SHA512 0bc255188ca1915df02f4a8d6efcd598be9e4c288bdae6a9e3153aa1e684457629d9682b7d5436eb886d9119c1935bd52dde858161144d44dc259c0259c407fc WHIRLPOOL 2f20df045a8eae9b392f8dc6af0e14d558067694ee2f68627c2a6f45c3b5b5cb711cff9a17e63ca6f05771b40126acaa49ff633e2ae8e1bfef3a0f83c8878b98 +MISC ChangeLog 26714 SHA256 9023f297998fa1747fac53c227b282ccbfa5a429adda3d5548a2b591057ad277 SHA512 5eb2ba6b0fb34452467641a1f53da72bdd0f18002073cf2b482c4cdae1763d2497de232f38a1752f7ab7cf45d7e8852b186445c0a6aba89f230565d55d8d7de6 WHIRLPOOL 3807b6b6f47da1f630d8f878c282aa536c26a89721d2c594e5dec886e352e3dc6e092442668c4a0458e944c773e23bf790b6e1fba3933d4dd2886a1a6996df8a +MISC metadata.xml 787 SHA256 6f5285eb2893a24ee779d1b1cf1840d0e34e38d152e65fdcb0244bfa5e6eceaa SHA512 2924fa1236aa39e737fce9d3c937bc8fc78ceaec165f45799bb07851c702a8f7be794907b2b7601abf3cd1a52db841c92403c03ba69626348f6c3bee7cc47a66 WHIRLPOOL 8d7dd3e4c7e4944458bdd5c7dd874d674ba12cb3dc868d0e451c29d1621a311a65519fae725f907060a88ecf792ccef44ec49df10d76d664a490e28cf78edaf0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJTiIBWAAoJEC7dUkA7aK9H71MP/Ry1rRgA8OyfXZxyuh12k44A -kGi8Vj38U3WLzx3IWw4fwNR5oc0EZ6VmBO4SY0w37MtbCLKAlWGKi8IaLEws6pdC -YjV4Eo0MmV/EHTlp6+uxYXv6IK6vU7YyzSVu4kjRl/rRD9H7ZW7MgC4DpZdg2pWw -yU+4wQhsn0HR6Kd6MZrGDu91Fa3AEhud0jXH+xT2r6n5ZF0ckByWLILmJVg9BzHW -Dt8uQ+XWuZvskV56yOMY/U0SsXzRRAhUKCTScBrAOQO6dTw+eUN9b8VGkrR2XTvU -Gz0hfIGeVqkJsy6dOT9rFzhVD0L5qOQR4q9mWcCFPcbY6F2lcq8ZQ/n5SMjkrZqm -cg6CmHOw/XhRMit8VQVKeSeJNx5Pbf+UKoZR2erIMhIuWswGG7/+tVEAtfgQWkI0 -PXp57EuVo/xkPy8WCXM4RcHWGtrWh3XWRshFJDnwpC6mzZq1Ho/eDbxWZlT9f1ob -3GvYfzgJZFS2kMLi2L6Vf7n5iC50kFJE26h81hW1wQ6spj1TjIohJgUsc+i+yxFu -JlU4VkR/TGwHsFnLpmQ3odV6vephVEesuKRx5BKUOJyyDbDtDjh4ZOXkcJZXO4dY -nfXtxAGQm7MSkZ0LoUJPEGSkUX4RdqPcpOlQcpwk9Jo7tfl8RPcuE1fRNxg2rrTe -qkNW2LyixbPjELH7E6bY -=eVVR +iEYEAREIAAYFAlQMWPgACgkQCaWpQKGI+9Qt6gCdHQL9BaTzGO3IVXZJxEhwpUaU +QMcAn2lES9Smj7wyTKNUju9PK/cQpnnq +=f7Ja -----END PGP SIGNATURE----- diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch deleted file mode 100644 index 374f9454ef89..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp Firebird-2.0.3.12981-0/src/remote/protocol.cpp ---- Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp 2007-11-05 21:07:50.000000000 -0500 -+++ Firebird-2.0.3.12981-0/src/remote/protocol.cpp 2008-02-17 19:39:16.000000000 -0500 -@@ -1347,7 +1347,7 @@ - - rem_port* port = (rem_port*) xdrs->x_public; - -- if (request_id >= port->port_object_vector->vec_count) -+ if (!port->port_objects || request_id >= port->port_object_vector->vec_count) - return FALSE; - - rrq* request = (rrq*) port->port_objects[request_id]; -@@ -1644,7 +1644,7 @@ - rem_port* port = (rem_port*) xdrs->x_public; - RSR statement; - if (statement_id >= 0) { -- if (statement_id >= port->port_object_vector->vec_count) -+ if (!port->port_objects || statement_id >= port->port_object_vector->vec_count) - return FALSE; - if (!(statement = (RSR) port->port_objects[statement_id])) - return FALSE; -@@ -1736,7 +1736,7 @@ - - rem_port* port = (rem_port*) xdrs->x_public; - if (statement_id >= 0) { -- if (statement_id >= port->port_object_vector->vec_count) -+ if (!port->port_objects || statement_id >= port->port_object_vector->vec_count) - return FALSE; - statement = (RSR) port->port_objects[statement_id]; - } -diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/server.cpp Firebird-2.0.3.12981-0/src/remote/server.cpp ---- Firebird-2.0.3.12981-0_orig/src/remote/server.cpp 2007-11-05 21:07:50.000000000 -0500 -+++ Firebird-2.0.3.12981-0/src/remote/server.cpp 2008-02-17 19:39:31.000000000 -0500 -@@ -74,7 +74,8 @@ - - #define CHECK_HANDLE(blk, cast, type, id, err) \ - { \ -- if (id >= port->port_object_vector->vec_count || \ -+ if (!port->port_objects || \ -+ id >= port->port_object_vector->vec_count || \ - !(blk = (cast) port->port_objects [id]) || \ - ((BLK) blk)->blk_type != (UCHAR) type) \ - { \ -@@ -87,7 +88,8 @@ - - #define CHECK_HANDLE_MEMBER(blk, cast, type, id, err) \ - { \ -- if (id >= this->port_object_vector->vec_count || \ -+ if (!this->port_objects || \ -+ id >= this->port_object_vector->vec_count || \ - !(blk = (cast) this->port_objects [id]) || \ - ((BLK) blk)->blk_type != (UCHAR) type) \ - { \ -@@ -1011,6 +1013,12 @@ - port->port_status_vector = status_vector; - success(status_vector); - -+ // This buffer is used by INET and WNET transports -+ // to return the server identification string -+ UCHAR buffer[BUFFER_TINY]; -+ const CSTRING save_string = send->p_resp.p_resp_data; -+ send->p_resp.p_resp_data.cstr_address = buffer; -+ - rem_port* aux_port = port->request(send); - RDB rdb = port->port_context; - if (bad_db(status_vector, rdb)) -@@ -1026,6 +1034,7 @@ - /* restore the port status vector */ - - port->port_status_vector = save_status; -+ send->p_resp.p_resp_data = save_string; - return; - } - -@@ -1037,6 +1046,7 @@ - /* restore the port status vector */ - - port->port_status_vector = save_status; -+ send->p_resp.p_resp_data = save_string; - } - - -@@ -1448,6 +1458,8 @@ - printf("disconnect(server) free rdb %x\n", rdb); - #endif - this->port_context = NULL; -+ if (this->port_async) -+ this->port_async->port_context = NULL; - ALLR_release(rdb); - if (this->port_object_vector) - { diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch deleted file mode 100644 index 83633af5ec05..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch +++ /dev/null @@ -1,629 +0,0 @@ -# Stolen from upstream CVS B2_0_Release branch -# Fixes CVE-2008-0467http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0467 -# Debian BTS: http://bugs.debian.org/463596 -# Upstream CORE-1603: http://tracker.firebirdsql.org/browse/CORE-1603?page=com.atlassian.jira.plugin.system.issuetabpanels:cvs-tabpanel ---- 2.0.orig/src/jrd/constants.h -+++ 2.0/src/jrd/constants.h -@@ -56,7 +56,7 @@ - - /* Misc constant values */ - --const int USERNAME_LENGTH = 31; /* Characters */ -+const unsigned int USERNAME_LENGTH = 31; /* Characters */ - - const size_t MAX_SQL_IDENTIFIER_SIZE = 32; - const size_t MAX_SQL_IDENTIFIER_LEN = MAX_SQL_IDENTIFIER_SIZE - 1; ---- 2.0.orig/src/jrd/isc.cpp -+++ 2.0/src/jrd/isc.cpp -@@ -87,14 +87,13 @@ - - #include <windows.h> - #include <aclapi.h> -+#include <lmcons.h> - - static USHORT os_type; - static SECURITY_ATTRIBUTES security_attr; - - //static TEXT interbase_directory[MAXPATHLEN]; - --static bool check_user_privilege(); -- - #endif // WIN_NT - - static TEXT user_name[256]; -@@ -393,14 +392,29 @@ - } - #endif - -+const TEXT* ISC_get_host(Firebird::string& host) -+{ -+/************************************** -+ * -+ * I S C _ g e t _ h o s t -+ * -+ ************************************** -+ * -+ * Functional description -+ * Get host name in non-plain buffer. -+ * -+ **************************************/ -+ TEXT buffer[BUFFER_SMALL]; -+ ISC_get_host(buffer, sizeof(buffer)); -+ host = buffer; -+ return host.c_str(); -+} -+ - #ifdef UNIX --int ISC_get_user(TEXT* name, -- int* id, -- int* group, -- TEXT* project, -- TEXT* organization, -- int* node, -- const TEXT* user_string) -+bool ISC_get_user(Firebird::string* name, -+ int* id, -+ int* group, -+ const TEXT* user_string) - { - /************************************** - * -@@ -448,7 +462,7 @@ - } - - if (name) -- strcpy(name, p); -+ *name = p; - - if (id) - *id = euid; -@@ -456,15 +470,6 @@ - if (group) - *group = egid; - -- if (project) -- *project = 0; -- -- if (organization) -- *organization = 0; -- -- if (node) -- *node = 0; -- - return (euid == 0); - } - #endif -@@ -573,13 +578,10 @@ - #endif - - #ifdef WIN_NT --int ISC_get_user(TEXT* name, -- int* id, -- int* group, -- TEXT* project, -- TEXT* organization, -- int* node, -- const TEXT* user_string) -+bool ISC_get_user(Firebird::string* name, -+ int* id, -+ int* group, -+ const TEXT* user_string) - { - /************************************** - * -@@ -597,162 +599,25 @@ - if (group) - *group = -1; - -- if (project) -- *project = 0; -- -- if (organization) -- *organization = 0; -- -- if (node) -- *node = 0; -- - if (name) - { -- name[0] = 0; -- DWORD name_len = 128; -- if (GetUserName(name, &name_len)) -- { -- name[name_len] = 0; -- -- /* NT user name is case insensitive */ -- -- for (DWORD i = 0; i < name_len; i++) -- { -- name[i] = UPPER7(name[i]); -- } -- --/* This check is not internationalized, the security model needs to be -- * reengineered, especially on SUPERSERVER where none of these local -- * user (in process) assumptions are valid. -- if (!strcmp(name, "ADMINISTRATOR")) -- { -- if (id) -- *id = 0; -- -- if (group) -- *group = 0; -- } -- */ -- } -- } -- -- return check_user_privilege(); --} -- -- --//____________________________________________________________ --// --// Check to see if the user belongs to the administrator group. --// --// This routine was adapted from code in routine RunningAsAdminstrator --// in \mstools\samples\regmpad\regdb.c. --// --static bool check_user_privilege() --{ -- HANDLE tkhandle; -- SID_IDENTIFIER_AUTHORITY system_sid_authority = {SECURITY_NT_AUTHORITY}; -- -- // First we must open a handle to the access token for this thread. -- -- if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &tkhandle)) -- { -- if (GetLastError() == ERROR_NO_TOKEN) -+ DWORD name_len = UNLEN; -+ TEXT* nm = name->getBuffer(name_len + 1); -+ if (GetUserName(nm, &name_len)) - { -- // If the thread does not have an access token, we'll examine the -- // access token associated with the process. -+ nm[name_len] = 0; - -- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &tkhandle)) -- { -- CloseHandle(tkhandle); -- return false; -- } -+ // NT user name is case insensitive -+ CharUpperBuff(nm, name_len); -+ name->recalculate_length(); - } - else - { -- return false; -+ *name = ""; - } - } - -- TOKEN_GROUPS* ptg = NULL; -- DWORD token_len = 0; -- -- while (true) -- { -- /* Then we must query the size of the group information associated with -- the token. This is guarenteed to fail the first time through -- because there is no buffer. */ -- -- if (GetTokenInformation(tkhandle, -- TokenGroups, -- ptg, -- token_len, -- &token_len)) -- { -- break; -- } -- -- /* If there had been a buffer, it's either too small or something -- else is wrong. Either way, we can dispose of it. */ -- -- if (ptg) -- { -- gds__free(ptg); -- } -- -- /* Here we verify that GetTokenInformation failed for lack of a large -- enough buffer. */ -- -- if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) -- { -- CloseHandle(tkhandle); -- return false; -- } -- -- // Allocate a buffer for the group information. -- ptg = (TOKEN_GROUPS *) gds__alloc((SLONG) token_len); -- -- if (!ptg) -- { -- CloseHandle(tkhandle); -- return false; /* NOMEM: */ -- } -- // FREE: earlier in this loop, and at procedure return -- } -- -- // Create a System Identifier for the Admin group. -- -- PSID admin_sid; -- -- if (!AllocateAndInitializeSid(&system_sid_authority, 2, -- SECURITY_BUILTIN_DOMAIN_RID, -- DOMAIN_ALIAS_RID_ADMINS, -- 0, 0, 0, 0, 0, 0, &admin_sid)) -- { -- gds__free(ptg); -- CloseHandle(tkhandle); -- return false; -- } -- -- // Finally we'll iterate through the list of groups for this access -- // token looking for a match against the SID we created above. -- -- bool admin_priv = false; -- -- for (DWORD i = 0; i < ptg->GroupCount; i++) -- { -- if (EqualSid(ptg->Groups[i].Sid, admin_sid)) -- { -- admin_priv = true; -- break; -- } -- } -- -- // Deallocate the SID we created. -- -- FreeSid(admin_sid); -- gds__free(ptg); -- CloseHandle(tkhandle); -- return admin_priv; -+ return false; - } - #endif - ---- 2.0.orig/src/jrd/isc_proto.h -+++ 2.0/src/jrd/isc_proto.h -@@ -25,6 +25,7 @@ - #define JRD_ISC_PROTO_H - - #include "../jrd/isc.h" -+#include "../common/classes/fb_string.h" - - void ISC_ast_enter(void); - void ISC_ast_exit(void); -@@ -32,9 +33,9 @@ - // There's no body for those functions. - //void ISC_get_config(TEXT *, struct ipccfg *); - //int ISC_set_config(TEXT *, struct ipccfg *); --TEXT* ISC_get_host(TEXT *, USHORT); --int ISC_get_user(TEXT*, int*, int*, TEXT*, -- TEXT*, int*, const TEXT*); -+TEXT* ISC_get_host(TEXT *, USHORT); -+const TEXT* ISC_get_host(Firebird::string&); -+bool ISC_get_user(Firebird::string*, int*, int*, const TEXT*); - SLONG ISC_get_user_group_id(const TEXT*); - void ISC_set_user(const TEXT*); - SLONG ISC_get_prefix(const TEXT*); ---- 2.0.orig/src/jrd/jrd.cpp -+++ 2.0/src/jrd/jrd.cpp -@@ -6699,12 +6699,9 @@ - **/ - static void getUserInfo(UserId& user, const DatabaseOptions& options) - { -- TEXT name[129] = ""; -- TEXT project[33] = ""; -- TEXT organization[33] = ""; -- -- int node_id = 0; - int id = -1, group = -1; // CVC: This var contained trash -+ int node_id = 0; -+ Firebird::string name; - - #ifdef BOOT_BUILD - bool wheel = true; -@@ -6712,12 +6709,9 @@ - bool wheel = false; - if (options.dpb_user_name.isEmpty()) - { -- wheel = ISC_get_user(name, -+ wheel = ISC_get_user(&name, - &id, - &group, -- project, -- organization, -- &node_id, - options.dpb_sys_user_name.nullStr()); - } - -@@ -6738,18 +6732,18 @@ - { - if (options.dpb_user_name.hasData()) - { -- options.dpb_user_name.copyTo(name, sizeof name); -+ name = options.dpb_user_name; - } - else - { -- strcpy(name, "<Unknown>"); -+ name = "<Unknown>"; - } - } - - // if the name from the user database is defined as SYSDBA, - // we define that user id as having system privileges - -- if (!strcmp(name, SYSDBA_USER_NAME)) -+ if (name == SYSDBA_USER_NAME) - { - wheel = true; - } -@@ -6761,12 +6755,12 @@ - - if (wheel) - { -- strcpy(name, SYSDBA_USER_NAME); -+ name = SYSDBA_USER_NAME; - } - - user.usr_user_name = name; -- user.usr_project_name = project; -- user.usr_org_name = organization; -+ user.usr_project_name = ""; -+ user.usr_org_name = ""; - user.usr_sql_role_name = options.dpb_role_name; - user.usr_user_id = id; - user.usr_group_id = group; ---- 2.0.orig/src/jrd/jrd_pwd.h -+++ 2.0/src/jrd/jrd_pwd.h -@@ -66,11 +66,11 @@ - - static void initialize(); - static void shutdown(); -- static void verifyUser(TEXT*, const TEXT*, const TEXT*, const TEXT*, -+ static void verifyUser(Firebird::string&, const TEXT*, const TEXT*, const TEXT*, - int*, int*, int*, const Firebird::string&); - - static void hash(Firebird::string& h, -- const TEXT* userName, -+ const Firebird::string& userName, - const TEXT* passwd) - { - Firebird::string salt; -@@ -79,7 +79,7 @@ - } - - static void hash(Firebird::string& h, -- const TEXT* userName, -+ const Firebird::string& userName, - const TEXT* passwd, - const Firebird::string& oldHash) - { -@@ -110,7 +110,7 @@ - - void fini(); - void init(); -- bool lookup_user(TEXT*, int*, int*, TEXT*); -+ bool lookup_user(const TEXT*, int*, int*, TEXT*); - bool prepare(); - - static SecurityDatabase instance; ---- 2.0.orig/src/jrd/pwd.cpp -+++ 2.0/src/jrd/pwd.cpp -@@ -263,7 +263,7 @@ - counter += (is_cached) ? 1 : 0; - } - --bool SecurityDatabase::lookup_user(TEXT * user_name, int *uid, int *gid, TEXT * pwd) -+bool SecurityDatabase::lookup_user(const TEXT* user_name, int* uid, int* gid, TEXT* pwd) - { - bool found = false; // user found flag - TEXT uname[129]; // user name buffer -@@ -433,7 +433,7 @@ - instance.fini(); - } - --void SecurityDatabase::verifyUser(TEXT* name, -+void SecurityDatabase::verifyUser(Firebird::string& name, - const TEXT* user_name, - const TEXT* password, - const TEXT* password_enc, -@@ -444,12 +444,11 @@ - { - if (user_name) - { -- TEXT* p = name; -- for (const TEXT* q = user_name; *q; ++q, ++p) -+ name = user_name; -+ for (unsigned int n = 0; n < name.length(); ++n) - { -- *p = UPPER7(*q); -+ name[n] = UPPER7(name[n]); - } -- *p = 0; - } - - #ifndef EMBEDDED -@@ -459,7 +458,7 @@ - // that means the current context must be saved and restored. - - TEXT pw1[MAX_PASSWORD_LENGTH + 1]; -- const bool found = instance.lookup_user(name, uid, gid, pw1); -+ const bool found = instance.lookup_user(name.c_str(), uid, gid, pw1); - pw1[MAX_PASSWORD_LENGTH] = 0; - Firebird::string storedHash(pw1, MAX_PASSWORD_LENGTH); - storedHash.rtrim(); ---- 2.0.orig/src/jrd/svc.cpp -+++ 2.0/src/jrd/svc.cpp -@@ -516,7 +516,7 @@ - } - else - { -- TEXT name[129]; // unused after retrieved -+ Firebird::string name; // unused after retrieved - int id, group, node_id; - - Firebird::string remote = options.spb_network_protocol + ---- 2.0.orig/src/remote/inet.cpp -+++ 2.0/src/remote/inet.cpp -@@ -462,20 +462,16 @@ - - /* Pick up some user identification information */ - Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE); -- char buffer[BUFFER_SMALL]; -- -+ Firebird::string buffer; - int eff_gid; - int eff_uid; -- ISC_get_user(buffer, &eff_uid, &eff_gid, 0, 0, 0, user_string); -- user_id.insertString(CNCT_user, buffer, strlen(buffer)); - -- ISC_get_host(buffer, sizeof(buffer)); -- for (char* p = buffer; *p; p++) { -- if (*p >= 'A' && *p <= 'Z') { -- *p = *p - 'A' + 'a'; -- } -- } -- user_id.insertString(CNCT_host, buffer, strlen(buffer)); -+ ISC_get_user(&buffer, &eff_uid, &eff_gid, user_string); -+ user_id.insertString(CNCT_user, buffer); -+ -+ ISC_get_host(buffer); -+ buffer.lower(); -+ user_id.insertString(CNCT_host, buffer); - - if ((eff_uid == -1) || uv_flag) { - user_id.insertTag(CNCT_user_verification); ---- 2.0.orig/src/remote/inet_server.cpp -+++ 2.0/src/remote/inet_server.cpp -@@ -96,6 +96,7 @@ - #include "../jrd/sch_proto.h" - #include "../jrd/thread_proto.h" - #include "../common/utils_proto.h" -+#include "../common/classes/fb_string.h" - - #ifdef UNIX - #ifdef NETBSD -@@ -328,14 +329,14 @@ - // Remove restriction on username, for DEV builds - // restrict only for production builds. MOD 21-July-2002 - #ifndef DEV_BUILD -- TEXT user_name[256]; /* holds the user name */ -+ Firebird::string user_name; /* holds the user name */ - /* check user id */ -- ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL); -+ ISC_get_user(&user_name, NULL, NULL, NULL); - -- if (strcmp(user_name, "root") && -- strcmp(user_name, FIREBIRD_USER_NAME) && -- strcmp(user_name, INTERBASE_USER_NAME) && -- strcmp(user_name, INTERBASE_USER_SHORT)) -+ if (user_name != "root" && -+ user_name != FIREBIRD_USER_NAME && -+ user_name != INTERBASE_USER_NAME && -+ user_name != INTERBASE_USER_SHORT) - { - /* invalid user -- bail out */ - fprintf(stderr, ---- 2.0.orig/src/remote/os/win32/wnet.cpp -+++ 2.0/src/remote/os/win32/wnet.cpp -@@ -135,25 +135,17 @@ - PACKET* packet = &rdb->rdb_packet; - - /* Pick up some user identification information */ -- TEXT buffer[128]; -+ Firebird::string buffer; - TEXT *p; - Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE); - -- ISC_get_user(buffer, 0, 0, 0, 0, 0, 0); -- for (p = buffer; *p; p++) { -- if (*p >= 'A' && *p <= 'Z') { -- *p = *p - 'A' + 'a'; -- } -- } -- user_id.insertString(CNCT_user, buffer, strlen(buffer)); -- -- ISC_get_host(buffer, sizeof(buffer)); -- for (p = buffer; *p; p++) { -- if (*p >= 'A' && *p <= 'Z') { -- *p = *p - 'A' + 'a'; -- } -- } -- user_id.insertString(CNCT_host, buffer, strlen(buffer)); -+ ISC_get_user(&buffer, 0, 0, 0); -+ buffer.lower(); -+ user_id.insertString(CNCT_user, buffer); -+ -+ ISC_get_host(buffer); -+ buffer.lower(); -+ user_id.insertString(CNCT_host, buffer); - - if (uv_flag) { - user_id.insertTag(CNCT_user_verification); ---- 2.0.orig/src/remote/xnet.cpp -+++ 2.0/src/remote/xnet.cpp -@@ -214,25 +214,16 @@ - - // Pick up some user identification information - -- TEXT buffer[BUFFER_TINY]; -- TEXT *p; -+ Firebird::string buffer; - Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE); - -- ISC_get_user(buffer, 0, 0, 0, 0, 0, 0); -- for (p = buffer; *p; p++) { -- if (*p >= 'A' && *p <= 'Z') { -- *p = *p - 'A' + 'a'; -- } -- } -- user_id.insertString(CNCT_user, buffer, strlen(buffer)); -- -- ISC_get_host(buffer, sizeof(buffer)); -- for (p = buffer; *p; p++) { -- if (*p >= 'A' && *p <= 'Z') { -- *p = *p - 'A' + 'a'; -- } -- } -- user_id.insertString(CNCT_host, buffer, strlen(buffer)); -+ ISC_get_user(&buffer, 0, 0, 0); -+ buffer.lower(); -+ user_id.insertString(CNCT_user, buffer); -+ -+ ISC_get_host(buffer); -+ buffer.lower(); -+ user_id.insertString(CNCT_host, buffer); - - if (uv_flag) { - user_id.insertTag(CNCT_user_verification); ---- 2.0.orig/src/utilities/guard/guard.cpp -+++ 2.0/src/utilities/guard/guard.cpp -@@ -45,6 +45,7 @@ - #include "../jrd/gds_proto.h" - #include "../jrd/file_params.h" - #include "../utilities/guard/util_proto.h" -+#include "../common/classes/fb_string.h" - - const USHORT FOREVER = 1; - const USHORT ONETIME = 2; -@@ -107,12 +108,13 @@ - } /* while */ - - /* check user id */ -- TEXT user_name[256]; /* holds the user name */ -- ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL); -+ Firebird::string user_name; /* holds the user name */ -+ ISC_get_user(&user_name, NULL, NULL, NULL); - -- if (strcmp(user_name, INTERBASE_USER) && strcmp(user_name, "root") -- && strcmp(user_name, FIREBIRD_USER) -- && strcmp(user_name, INTERBASE_USER_SHORT)) -+ if (user_name != INTERBASE_USER && -+ user_name != "root" && -+ user_name != FIREBIRD_USER && -+ user_name != INTERBASE_USER_SHORT) - { - /* invalid user bail out */ - fprintf(stderr, diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch deleted file mode 100644 index 3de90c0bc40d..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.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.3.12981.0-flags.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch deleted file mode 100644 index c1cc28edab90..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux ---- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux 2007-11-05 21:07:48.000000000 -0500 -+++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux 2007-11-05 21:23:36.000000000 -0500 -@@ -20,7 +20,7 @@ - - # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion - # you may remove it if engine is getting compiled with any other GCC version --PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -+PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC - DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 - #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 - diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch deleted file mode 100644 index 6369727aa0a7..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.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.1.2.18118.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch deleted file mode 100644 index d324bd7c5c55..000000000000 --- a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird ---- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird 2008-12-10 17:22:15.000000000 +0200 -+++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird 2009-05-20 15:13:47.673202327 +0300 -@@ -185,14 +185,7 @@ - # - - external_libraries: --ifeq ($(STD_ICU),false) -- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu --endif --ifeq ($(STD_EDITLINE),false) --ifeq ($(EDITLINE_FLG),Y) -- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline --endif --endif -+ - - btyacc_binary: $(BTYACC) - -diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults ---- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults 2008-09-04 14:47:18.000000000 +0300 -+++ Firebird-2.1.2.18118-0/builds/posix/make.defaults 2009-05-20 15:15:31.088202976 +0300 -@@ -232,11 +232,7 @@ - LIBFBSTATIC_A = $(LIB)/libfbstatic.a - - ifeq ($(EDITLINE_FLG),Y) -- ifeq ($(STD_EDITLINE), true) -- LIBEDITLINE := -leditline -- else -- LIBEDITLINE := $(LIB)/libeditline.a -- endif -+ LIBEDITLINE := -ledit - endif - - LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ -diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules ---- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules 2008-12-10 03:03:31.000000000 +0200 -+++ Firebird-2.1.2.18118-0/builds/posix/make.rules 2009-05-20 15:21:04.114225351 +0300 -@@ -33,9 +33,6 @@ - - # 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 -DNAMESPACE=Vulcan --ifeq ($(STD_ICU),false) -- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n --endif - - ifeq ($(IsProdTypeBuild),Y) - CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD -@@ -69,7 +66,7 @@ - - .SUFFIXES: .c .e .epp .cpp - --.e.c: -+.e.c: $(GPRE_CURRENT) - $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ - - -diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets ---- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets 2008-12-10 03:03:31.000000000 +0200 -+++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets 2009-05-20 15:21:59.299203496 +0300 -@@ -49,7 +49,7 @@ - - # 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) $< $@ - - -diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux ---- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux 2007-05-03 14:24:50.000000000 +0300 -+++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux 2009-05-20 15:23:17.286523276 +0300 -@@ -20,12 +20,10 @@ - - # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion - # you may remove it if engine is getting compiled with any other GCC version -- --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -+COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) - DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) - #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) - -diff -Naur Firebird-2.1.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure ---- Firebird-2.1.2.18118-0_orig/configure 2009-03-30 09:42:44.000000000 +0300 -+++ Firebird-2.1.2.18118-0/configure 2009-05-20 15:26:30.856202564 +0300 -@@ -4027,13 +4027,13 @@ - # not need editline in default libs, but need to test for its presence - saveLIBS=$LIBS - if test "$STD_EDITLINE" = "true"; then -- { echo "$as_me:$LINENO: checking for readline in -leditline" >&5 --echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for readline in -ledit" >&5 -+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; } - if test "${ac_cv_lib_editline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-leditline $LIBS" -+LIBS="-ledit $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch deleted file mode 100644 index 1e0fc093668e..000000000000 --- a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/common/classes/alloc.h.old 2009-07-09 13:04:14.000000000 +0200 -+++ src/common/classes/alloc.h 2009-07-09 13:05:37.000000000 +0200 -@@ -48,6 +48,8 @@ - stdlib.h (EKU) */ - #endif - -+#include <new> -+ - #ifdef _MSC_VER - #define THROW_BAD_ALLOC - #else -@@ -448,15 +450,6 @@ - ); - } - --inline void* operator new(size_t, void* ptr) throw() --{ -- return ptr; --} --inline void* operator new[](size_t, void* ptr) throw() --{ -- return ptr; --} -- - inline void operator delete(void* mem) throw() - { - Firebird::MemoryPool::globalFree(mem); diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch deleted file mode 100644 index 1f44fcc97aed..000000000000 --- a/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch +++ /dev/null @@ -1,228 +0,0 @@ -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util B2_5_Release/builds/posix/Makefile.in.client.util ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.client.util 2011-03-09 23:35:01.000000000 -0500 -@@ -53,11 +53,6 @@ - $(CLUMPLETS_Objects) $(FBCONFIG_Objects) - - --CREATEDB_Files= create_db.cpp --CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files)) --CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources)))) -- -- - DROP_Other_Sources = common/utils.cpp lock/lock.cpp jrd/isc_sync.cpp jrd/isc.cpp \ - common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) - -@@ -133,7 +128,7 @@ - RELAY_Sources = $(addprefix utilities/, $(RELAY_Files)) - RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources)))) - --AllObjects = $(CREATEDB_Object) $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \ -+AllObjects = $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \ - $(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(FBSVCMGR_Objects) \ - $(FBTRACEMGR_Objects) - -@@ -141,17 +136,11 @@ - Dependencies = $(AllObjects:.o=.d) - - --.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print \ -+.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay fb_lock_print \ - fbsvcmgr fbtracemgr - - all: $(CLIENT_UTIL_TARGETS) - --create_db: $(CREATE_DB) -- --$(CREATE_DB): $(CREATEDB_Objects) -- $(STATICEXE_LINK) $(LINK_OPTS) $(CREATEDB_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) -- -- - nbackup: $(LIBFBCLIENT_SO) $(NBACKUP) - - $(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects) -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes B2_5_Release/builds/posix/Makefile.in.codes ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.codes 2011-03-09 23:35:01.000000000 -0500 -@@ -22,7 +22,8 @@ - # - # - ROOT=.. --ObjModuleType=std -+ObjModuleType=boot -+CXXFLAGS+= -DBOOT_BUILD - - include $(ROOT)/gen/make.defaults - include $(ROOT)/gen/make.platform -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util B2_5_Release/builds/posix/Makefile.in.embed.util ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.embed.util 2011-03-09 23:35:01.000000000 -0500 -@@ -56,11 +56,6 @@ - $(FBCONFIG_Objects) - - --CREATEDB_Files= create_db.cpp --CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files)) --CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources)))) -- -- - DROP_Other_Sources += common/utils.cpp jrd/isc_sync.cpp jrd/isc.cpp \ - common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) - -@@ -128,30 +123,19 @@ - RELAY_Sources = $(addprefix utilities/, $(RELAY_Files)) - RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources)))) - --AllObjects = $(CREATEDB_Object) $(DROP_Object) $(FBSVCMGR_Objects) \ -+AllObjects = $(DROP_Object) $(FBSVCMGR_Objects) \ - $(GSEC_Objects) $(GSTAT_Object) $(FBGUARD_Objects) \ - $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(CLUMPLETS_Objects) - - Dependencies = $(AllObjects:.o=.d) - - --.PHONY: create_db gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \ -+.PHONY: gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \ - fbsvcmgr fbtracemgr - - all: $(EMBED_UTIL_TARGETS) - - --# it's important to note here that create_db is linked against the static --# 'boot' libraries rather than the later embedded shared library. The --# other utilities are released but create_db is used in construction. --# MOD 29-July-2002 -- --create_db: $(CREATE_DB) -- --$(CREATE_DB): $(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) -- $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) -- -- - nbackup: $(LIBFBEMBED_SO) $(NBACKUP) - - $(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects) -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples B2_5_Release/builds/posix/Makefile.in.examples ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.examples 2011-03-09 23:35:01.000000000 -0500 -@@ -29,7 +29,8 @@ - # - # - ROOT=../.. --ObjModuleType=std -+ObjModuleType=boot -+CXXFLAGS+= -DBOOT_BUILD - - # Add the install include directory to the search path since the - # examples need to build using those headers values. -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace B2_5_Release/builds/posix/Makefile.in.fbtrace ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.fbtrace 2011-03-21 16:00:40.000000000 -0400 -@@ -71,6 +71,12 @@ - - fbtrace: $(FBTRACE) - -+ifeq (@FIREBIRD_ARCH_TYPE@,classic) -+ LINK_TRACE_LIBS += -lfbembed -+else -+ FBTRACE_Objects += $(addprefix $(OBJ)/, $(addsuffix .o, $(basename jrd/gds.cpp))) -+endif -+ - $(FBTRACE): $(FBTRACE_Objects) - $(LINK_TRACE) -o $@ $^ $(LINK_TRACE_LIBS) - -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird B2_5_Release/builds/posix/Makefile.in.firebird ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.firebird 2011-03-09 23:35:01.000000000 -0500 -@@ -263,7 +263,7 @@ - $(ISC_GDB): create_db empty_db gbak_static isql_static ref_databases - - create_db: -- $(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(CREATE_DB) -+ $(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb - - gbak_static: - $(MAKE) $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.static.gbak -@@ -286,8 +286,7 @@ - - #-------------------------------------------------------------------------- - #Phase3: Now we start building the tools we are actually going to use --# against the shared library. --# an empty database (lock manager and create_db). Then we rebuild all the -+# against the shared library. Then we rebuild all the - # items we have built in the static library into a dynamic library. - # (It's probably possible to directly build the dynamic library - but thats - # for another day). We still don't have the security database stuff. -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs B2_5_Release/builds/posix/Makefile.in.msgs ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.msgs 2011-03-09 23:35:01.000000000 -0500 -@@ -28,7 +28,8 @@ - # - # - ROOT=.. --ObjModuleType=std -+ObjModuleType=boot -+CXXFLAGS+= -DBOOT_BUILD - - include $(ROOT)/gen/make.defaults - include $(ROOT)/gen/make.platform -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases B2_5_Release/builds/posix/Makefile.in.refDatabases ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/Makefile.in.refDatabases 2011-03-09 23:35:01.000000000 -0500 -@@ -29,7 +29,8 @@ - # - # - ROOT=.. --ObjModuleType=std -+ObjModuleType=boot -+CXXFLAGS+= -DBOOT_BUILD - - include $(ROOT)/gen/make.defaults - include $(ROOT)/gen/make.platform -@@ -53,8 +54,8 @@ - - .PHONY: empty_db refDatabases - --# This is where you are going to have trouble if there is one, at creating --# the first empty database. Things to watch out for, $INTERBASE variable -+# This is where you are going to have trouble if there is one, at creating -+# the first empty database. Things to watch out for, $INTERBASE variable - # pointing in the wrong place, shared library path LD_LIBRARY_PATH - # not pointing to new stuff (mind you this point it should be creating - # using create_db statically linked). -@@ -62,7 +63,7 @@ - empty_db : empty.fdb yachts.lnk - - empty.fdb : $(CREATE_DB) -- $(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(BIN)/create_db -+ $(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb - -$(RM) $@ - $(BIN)/create_db $@ - $(TOUCH) $@ -diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults B2_5_Release/builds/posix/make.defaults ---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/builds/posix/make.defaults 2011-03-09 23:35:01.000000000 -0500 -@@ -49,9 +49,11 @@ - - FIREBIRD=$(GEN_ROOT)/firebird - INTERBASE=$(FIREBIRD) -+FIREBIRD_LOCK=$(shell cd $(FIREBIRD); pwd) - - export INTERBASE - export FIREBIRD -+export FIREBIRD_LOCK - - LIB=$(FIREBIRD)/lib - BIN=$(FIREBIRD)/bin -diff -Naur Firebird-2.5.0.26074-0_orig/configure.in B2_5_Release/configure.in ---- Firebird-2.5.0.26074-0_orig/configure.in 2010-11-09 12:42:45.000000000 -0500 -+++ B2_5_Release/configure.in 2011-06-13 17:10:35.412587676 -0400 -@@ -1359,6 +1389,7 @@ - gen/Makefile.static.gpre:${MAKE_SRC_DIR}/Makefile.in.static.gpre - gen/Makefile.static.gbak:${MAKE_SRC_DIR}/Makefile.in.static.gbak - gen/Makefile.static.isql:${MAKE_SRC_DIR}/Makefile.in.static.isql -+gen/Makefile.static.createdb:${MAKE_SRC_DIR}/Makefile.in.static.createdb - gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases - gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver - gen/Makefile.smp_server:${MAKE_SRC_DIR}/Makefile.in.smp_server - diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch deleted file mode 100644 index 8331c8122faf..000000000000 --- a/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird ---- orig/builds/posix/Makefile.in.firebird 2010-11-12 15:46:22.000000000 -0500 -+++ builds/posix/Makefile.in.firebird 2010-11-12 16:36:22.000000000 -0500 -@@ -145,7 +145,7 @@ - - firebird : firebird_@FIREBIRD_ARCH_TYPE@ $(PLATFORM_POSTBUILD_TARGET) - --firebird_classic firebird_embedded: firebird_basic classic_targets fbtrace -+firebird_classic firebird_embedded: firebird_boot libfbclient includes - firebird_super firebird_server: firebird_basic super_targets fbtrace - - diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch deleted file mode 100644 index 3c40461c7e2b..000000000000 --- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird ---- Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird 2010-11-12 15:45:04.000000000 -0500 -@@ -158,7 +158,7 @@ - # some complications particularly for super in needing to start the server - # that you are currently building. MOD 28-July-2002 - --firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets -+firebird_basic: firebird_boot basic_targets - - firebird_boot: updateBuildNum boot_phase1 boot_phase2 - -@@ -189,14 +189,6 @@ - # - - external_libraries: --ifeq ($(STD_ICU),false) -- $(MAKE) CFLAGS="@CFLAGS@" -f $(GEN_ROOT)/Makefile.extern.icu --endif --ifeq ($(STD_EDITLINE),false) --ifeq ($(EDITLINE_FLG),Y) -- $(MAKE) CFLAGS="@CFLAGS@" $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.extern.editline --endif --endif - - btyacc_binary: $(BTYACC) - -@@ -373,7 +365,7 @@ - .PHONY: fbserver - .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf - --super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient client_gfix client_gbak client_gsec\ -+super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient libfbembed fb_smp_server client_gfix client_gbak client_gsec\ - client_isql client_gpre client_util client_fbudf client_gdef client_qli $(PLAT_SUPER_POST_TRAGET) - - fbserver: -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults Firebird-2.5.0.26074-0/builds/posix/make.defaults ---- Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/make.defaults 2010-11-12 15:42:03.000000000 -0500 -@@ -138,7 +138,7 @@ - AR= ar @AR_OPTIONS@ crsu - LN= @LN_S@ - RANLIB= @RANLIB@ --BTYACC=$(ROOT)/extern/btyacc/btyacc -+BTYACC=/usr/bin/btyacc - - CC = @CC@ - CXX = @CXX@ -@@ -222,13 +222,7 @@ - - LIBFBSTATIC_A = $(LIB)/libfbstatic.a - --ifeq ($(EDITLINE_FLG),Y) -- ifeq ($(STD_EDITLINE), true) -- LIBEDITLINE := -l$(READLINE) -- else -- LIBEDITLINE := $(LIB)/libedit.a -- endif --endif -+LIBEDITLINE := -ledit - - LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \ - $(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \ -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.rules Firebird-2.5.0.26074-0/builds/posix/make.rules ---- Firebird-2.5.0.26074-0_orig//builds/posix/make.rules 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/make.rules 2010-11-12 15:06:43.000000000 -0500 -@@ -35,10 +35,6 @@ - WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \ - -DNAMESPACE=Vulcan - --ifeq ($(STD_ICU),false) -- WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n --endif -- - ifeq ($(IsProdTypeBuild),Y) - WFLAGS:= $(WFLAGS) $(PROD_FLAGS) - else -@@ -72,7 +68,7 @@ - - .SUFFIXES: .c .e .epp .cpp - --.e.c: -+.e.c: $(GPRE_CURRENT) - $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ - - -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets Firebird-2.5.0.26074-0/builds/posix/make.shared.targets ---- Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/make.shared.targets 2010-11-12 15:06:43.000000000 -0500 -@@ -49,7 +49,7 @@ - - # 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) $< $@ - - -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux Firebird-2.5.0.26074-0/builds/posix/prefix.linux ---- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux 2010-11-12 15:06:43.000000000 -0500 -@@ -18,11 +18,10 @@ - # - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=$(COMMON_FLAGS) - #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) - DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) - -diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64 ---- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64 2010-11-12 15:06:43.000000000 -0500 -@@ -18,12 +18,11 @@ - # - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -+COMMON_FLAGS=-DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - CXXFLAGS:= $(CXXFLAGS) -fno-rtti - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=$(COMMON_FLAGS) - #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) - DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) - -diff -Naur Firebird-2.5.0.26074-0_orig//configure Firebird-2.5.0.26074-0/configure ---- Firebird-2.5.0.26074-0_orig//configure 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0/configure 2010-11-12 15:06:44.000000000 -0500 -@@ -4585,13 +4585,15 @@ - if test "x$ac_cv_lib_edit_readline" = x""yes; then - READLINE=edit EDITLINE_FLG=Y - else -- { $as_echo "$as_me:$LINENO: checking for readline in -leditline" >&5 --$as_echo_n "checking for readline in -leditline... " >&6; } -+ { $as_echo "$as_me:$LINENO: checking for readline in -ledit" >&5 -+$as_echo_n "checking for readline in -ledit... " >&6; } -+ -+ - if test "${ac_cv_lib_editline_readline+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-leditline $LIBS" -+LIBS="-ledit $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch deleted file mode 100644 index 8be521cc0fac..000000000000 --- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400 -@@ -158,7 +158,7 @@ - # some complications particularly for super in needing to start the server - # that you are currently building. MOD 28-July-2002 - --firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets -+firebird_basic: firebird_boot basic_targets - - firebird_boot: updateBuildNum boot_phase1 boot_phase2 - -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults ---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400 -@@ -138,7 +138,7 @@ - AR= ar @AR_OPTIONS@ crsu - LN= @LN_S@ - RANLIB= @RANLIB@ --BTYACC=$(ROOT)/extern/btyacc/btyacc -+BTYACC=/usr/bin/btyacc - - CC = @CC@ - CXX = @CXX@ -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux ---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400 -@@ -18,11 +18,10 @@ - # - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=$(COMMON_FLAGS) - #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) - DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) - -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 ---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400 -@@ -18,12 +18,11 @@ - # - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - CXXFLAGS:= $(CXXFLAGS) -fno-rtti - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=$(COMMON_FLAGS) - #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) - DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) - diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch deleted file mode 100644 index 3891cc776fae..000000000000 --- a/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird ---- orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 -+++ builds/posix/Makefile.in.firebird 2011-03-07 20:26:56.612573632 -0500 -@@ -332,7 +332,7 @@ - .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql - .PHONY: embed_gpre embed_util - --classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \ -+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \ - embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET) - - libfbembed: diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild deleted file mode 100644 index 0e424736d065..000000000000 --- a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.6 2012/06/04 06:30:31 zmedico Exp $ - -inherit flag-o-matic eutils autotools user versionator multilib - -MY_P=Firebird-$(replace_version_separator 4 -) - -DESCRIPTION="A relational database offering many ANSI SQL-99 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 xinetd examples debug" -RESTRICT="userpriv" - -RDEPEND="dev-libs/libedit - dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" -RDEPEND="${RDEPEND} - xinetd? ( virtual/inetd ) - !sys-cluster/ganglia" - -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() { - 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" - - # compile time relative path hacks, ew :( - mkdir -p "${WORKDIR}/../etc" \ - "${WORKDIR}/usr" \ - "${WORKDIR}/var/log/firebird" \ - "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird - - cd "${S}" - - epatch "${FILESDIR}/${P}-CVE-2008-0387.patch" - epatch "${FILESDIR}/${P}-CVE-2008-0467.patch" - epatch "${FILESDIR}/${P}-external-libs.patch" - epatch "${FILESDIR}/${P}-flags.patch" - epatch "${FILESDIR}/${P}-make-deps.patch" - - einfo "Split up Firebird via relative path hacks" - # sed vs patch for portability and addtional location changes - # based on FIREBIRD=/usr/lib/firebird - check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ - src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line - check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ - -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ - -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ - -e 's:"isc_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \ - -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ - -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ - -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/file_params.h | wc -l)" "14" "src/jrd/file_params.h" # 14 lines - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line - check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line - check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ - -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ - -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ - -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ - -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ - -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ - -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ - -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ - -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ - src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines - check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ - src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line - check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ - src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ - src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line - check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ - src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line - - # Rename references to isql to fbsql - 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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines - check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ - -e 's:ISQL :FBSQL :w /dev/stdout' \ - src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines - - 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=/usr/$(get_libdir)/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" - -# Seems to be ignored? - insinto /usr/share/firebird/bin - dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh - rm bin/*.sh || die "Could not remove *sh files" - - einfo "Renaming isql -> fbsql" - mv bin/isql bin/fbsql - - insinto /usr/bin - dobin bin/* - - insinto /usr/include - doins include/* - - insinto /usr/$(get_libdir) - dolib.so lib/*.so* - dolib.a lib/*.a* - - insinto /usr/$(get_libdir)/firebird - doins *.msg - - insinto /usr/$(get_libdir)/firebird/help - doins help/help.fdb - - insinto /usr/share/firebird/upgrade - doins "${S}"/src/misc/upgrade/v2/* - - 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 /usr/$(get_libdir)/firebird/UDF - doexe UDF/*.so - - exeinto /usr/$(get_libdir)/firebird/intl - newexe intl/libfbintl.so fbintl.so - - insinto /usr/$(get_libdir)/firebird/intl - doins ../install/misc/fbintl.conf - - diropts -m 755 -o firebird -g firebird - dodir /var/log/firebird - dodir /var/run/firebird - keepdir /var/log/firebird - keepdir /var/run/firebird - - # create links for backwards compatibility - cd "${D}/usr/$(get_libdir)" - ln -s libfbclient.so libgds.so - ln -s libfbclient.so libgds.so.0 - ln -s libfbclient.so libfbclient.so.1 - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" - else - newinitd "${FILESDIR}/${PN}.init.d" ${PN} - newconfd "${FILESDIR}/${PN}.conf.d.2" ${PN} - fperms 640 /etc/conf.d/${PN} - fi - doenvd "${FILESDIR}/70${PN}" - - # Install docs - use doc && dodoc "${WORKDIR}"/manuals/* - use examples && docinto examples -} - -pkg_postinst() { - # Hack to fix ownership/perms - chown -fR firebird:firebird "${ROOT}/etc/firebird" \ - "${ROOT}/usr/$(get_libdir)/firebird" - chmod 750 "${ROOT}/etc/firebird" - - elog - elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" - elog "are in /var/log/firebird, and lock files in /var/run/firebird" - elog "The command line tool isql has been renamed to fbsql." - elog "Please report any problems or issues to bugs.gentoo.org." - elog -} - -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" - 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.*}" - - 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 ${ROOT}/etc/firebird)." - einfo - 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" -} diff --git a/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild b/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild deleted file mode 100644 index 7d4b9491c8b5..000000000000 --- a/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild,v 1.1 2013/01/24 04:52:12 pinkbyte Exp $ - -inherit flag-o-matic eutils autotools user versionator - -MY_P=Firebird-$(replace_version_separator 4 -) -#MY_P=Firebird-${PV/_rc/-ReleaseCandidate} - -DESCRIPTION="A relational database offering many ANSI SQL-99 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 xinetd examples debug" -RESTRICT="userpriv" - -RDEPEND="dev-libs/libedit - dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" -RDEPEND="${RDEPEND} - xinetd? ( virtual/inetd ) - !sys-cluster/ganglia" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup firebird 450 - enewuser firebird 450 /bin/bash /usr/lib/firebird firebird -} - -function check_sed() { - MSG="sed of $3, required $2 lines modified $1" - einfo "${MSG}" - [[ $1 -ge $2 ]] || die "${MSG}" -} - -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" - - # compile time relative path hacks, ew :( - mkdir -p "${WORKDIR}/../etc" \ - "${WORKDIR}/usr" \ - "${WORKDIR}/var/log/firebird" \ - "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird - - cd "${S}" - - epatch "${FILESDIR}/${PN}-2.1.2.18118.0-deps-flags-libs.patch" - - einfo "Split up Firebird via relative path hacks" - # sed vs patch for portability and addtional location changes - # based on FIREBIRD=/usr/lib/firebird - check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ - src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line - check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ - -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ - -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ - -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ - -e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \ - -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ - -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line - check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line - check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ - -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ - -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ - -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ - -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ - -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ - -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ - -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ - -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ - src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines - check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ - src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line - check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ - src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ - src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line - check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ - src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line - - # Rename references to isql to fbsql - 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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines - 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' \ - src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.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 - rm -rf "${S}"/extern/{editline,icu} - - epatch "${FILESDIR}/${PN}-2.1.2.18118.0-gcc-icu-declare.patch" - - # allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3) - epatch "${FILESDIR}/${PN}-update-valgrind.patch" - - eautoreconf -} - -src_compile() { - filter-flags -fprefetch-loop-arrays - filter-mfpmath sse - - econf --prefix=/usr/lib/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" - -# Seems to be ignored? - insinto /usr/share/firebird/bin - dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh - rm bin/*.sh || die "Could not remove *sh files" - - einfo "Renaming isql -> fbsql" - mv bin/isql bin/fbsql - - insinto /usr/bin - dobin bin/* - - insinto /usr/include - doins include/* - - insinto /usr/lib - dolib.so lib/*.so* - dolib.a lib/*.a* - - insinto /usr/lib/firebird - doins *.msg - - insinto /usr/lib/firebird/help - doins help/help.fdb - - insinto /usr/share/firebird/upgrade - doins "${S}"/src/misc/upgrade/v2/* - - 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 /usr/lib/firebird/UDF - doexe UDF/*.so - - exeinto /usr/lib/firebird/intl - newexe intl/libfbintl.so fbintl.so - - insinto /usr/lib/firebird/intl - doins ../install/misc/fbintl.conf - - diropts -m 755 -o firebird -g firebird - dodir /var/log/firebird - dodir /var/run/firebird - keepdir /var/log/firebird - keepdir /var/run/firebird - - # 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 - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" - else - newinitd "${FILESDIR}/${PN}.init.d" ${PN} - newconfd "${FILESDIR}/${PN}.conf.d" ${PN} - fperms 640 /etc/conf.d/${PN} - fi - - # Install docs - use doc && dodoc "${WORKDIR}"/manuals/* - use examples && docinto examples -} - -pkg_postinst() { - # Hack to fix ownership/perms - chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird" - chmod 750 "${ROOT}/etc/firebird" - - elog - elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" - elog "are in /var/log/firebird, and lock files in /var/run/firebird" - elog "The command line tool isql has been renamed to fbsql." - elog "Please report any problems or issues to bugs.gentoo.org." - elog -} - -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" - 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.*}" - - 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 ${ROOT}/etc/firebird)." - einfo - 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" -} diff --git a/dev-db/firebird/firebird-2.5.2.26539.0.ebuild b/dev-db/firebird/firebird-2.5.2.26539.0.ebuild deleted file mode 100644 index 43c411e9c682..000000000000 --- a/dev-db/firebird/firebird-2.5.2.26539.0.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.2.26539.0.ebuild,v 1.2 2013/10/09 15:38:02 hasufell Exp $ - -EAPI=4 - -inherit flag-o-matic eutils autotools multilib 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 -ia64 ~x86" -IUSE="doc client superserver xinetd examples debug" -RESTRICT="userpriv" - -RDEPEND="dev-libs/libedit - dev-libs/icu" -DEPEND="${RDEPEND} - >=dev-util/btyacc-3.0-r2 - doc? ( app-arch/unzip )" -RDEPEND="${RDEPEND} - xinetd? ( virtual/inetd ) - !sys-cluster/ganglia" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - if use client && use superserver ; then - die "Use flags client and superserver cannot be used together" - fi - if use client && use xinetd ; then - die "Use flags client and xinetd cannot be used together" - fi - if use superserver && use xinetd ; then - die "Use flags superserver and xinetd cannot be used together" - fi -} - -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() { - 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}" -} - -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.1.26351.0-deps-flags.patch" - - use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch" - if ! use superserver ; then - epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch" - fi - - # 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 - rm -rf "${S}"/extern/{btyacc,editline,icu} - - 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}" - - if use doc; then - dodoc "${S}"/doc/*.pdf - find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die - fi - - insinto /usr/include - doins 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}" - - elog - elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" - elog "are in /var/log/firebird, and lock files in /var/run/firebird" - elog "The command line tool isql has been renamed to fbsql." - elog "Please report any problems or issues to bugs.gentoo.org." - elog -} - -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.*}" - - 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 ${ROOT}/etc/firebird)." - einfo - 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" -} diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml index b7f594268a7f..18201c9b1e3d 100644 --- a/dev-db/firebird/metadata.xml +++ b/dev-db/firebird/metadata.xml @@ -1,16 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>proxy-maintainers</herd> <maintainer> -<email>wlt@obsidian-studios.com</email> -<name>William L. Thomson Jr.</name> -<description>Maintainer</description> -</maintainer> -<maintainer> -<email>patrick@gentoo.org</email> -<name>Patrick Lauer</name> -<description>Proxy maintainer</description> +<email>maintainer-needed@gentoo.org</email> </maintainer> <longdescription> Firebird is a relational database offering many ANSI SQL standard |