Sync with portage [Tue Dec 29 09:51:44 MSK 2020].

master
Calculate Linux 3 years ago
parent 43e6829bbe
commit 8abeb5237b

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29294 BLAKE2B 8a8d30298cbce3f6fa439f8192f7b79d64c55bea3c1922c90f04f60777586d0299621a19d14c3c88e5ba04b280ddc731d502e065b44fbdac2e476162d9c605aa SHA512 6245a7e1f6ac92c3249842044411b206d0e412e14a7b3f2cfe0ef3d17897dbd12ba351baabafdbd5f88a4fb3bf305a7608794e83e81288e49562cd6a3ebee79d
TIMESTAMP 2020-12-28T11:38:37Z
MANIFEST Manifest.files.gz 29291 BLAKE2B ffa2590a0ce8dbfdbdea4376a5c4c434ac4aa0dd9ff841c3d1421b2811e30a512fdd8fc471de0ae2dac7f593cf1bc6014d6a7ff00f06af627fef10276c04fdde SHA512 758d1330c29930c7e920eb8e20ab35d76950d8ff4138a882b8e6c603088d34846c49705754242016d012fbbddba0aff7c09482d0183b0e3a80dadf481f1a2e2f
TIMESTAMP 2020-12-29T06:08:39Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/pw71fFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/qx+dfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klBm3w/9GNmW2a7X5u6nTDCLwkhOBrqD2YkUWu4soGimdnFZP9t7opyN1drni018
z4bH+s4t1KrbnzvAxgu49ojVKatQvzoQktoyCD+gi/a6Zp9T3HygzveUHRjHwiyi
VD6j06wQByRv6tY8FKF3cFG54E6Pstq+BWvhEf8AGVE0oS8l163JqGkKDGs947bj
PlPITM7QD8q8MP970MHiqVVLwNjw5jy7Z/mIAdm7wIOXzzsz6NEvBynCZITcgitg
6sdSBjGm3H8ONMg+7porUqgFRBUWGmxGCsQrz9tNS7NcZjtuLtXEWZuZaXcjcp3o
E7D1G3NzzGNQgoVRRrWNSffLFdQgrHR14V06z8h0FZgZ6qkOyHvbBPGvh810fQXe
GTU+ZJjI6Tr4yjYKQYH2Qv2Dd3dhzjqQRrZ2zthhL1JJYrFyGVYJEamJGN9Jj+0l
MDBJL4Vr64zBnrRfpRmB+pkU2h5OnEJnNjk99C89Xg/F++Ehzrgvl9DhERk4BaUn
/J0bxKln34sait7CyGKYVHXI9V5YPNg6/pO6NptkqVDMZcLGfMyzX5ipv1h+F+OE
GavcwVrdxr6rNa3WAIwZUffez1PoB7hC9yJKP85fN9p7EKRqTRIJdfdRkPeR5QuR
QHI6/I/xJFXnj1TP9fzMx1YUsG1onUC1FcBfcJccZinb8fcJulM=
=sqK4
klApJA/+IvM9rZxRFq6yeIC9h78dv2/b5HYVvaRMVlmJ0byCpaOzS2uMIVhOVaxk
AGGooyEI4G0jJFayzuyRjRtkxndlw5+fz42h9ECDcLvDkF85U+lJmz4en/WNG5jn
nZWmy7UFODbf6ztjmP1lHWI1pj+bg8iHDu7njfGG+EvCWUtpYKRFfTNe/UICaJZM
+2BToRk2LQ5M1Wn/LWt1rlCeOlvijI7bHhuEWrbqQvJcwCIVd86Qi/lSReubHUUJ
NvU4v3YILLLTyQzhFl9b0ShCxqjql+Ox9BBi/aIcWHjVD7raMo4SG7wXpV8IHADw
upihICozXlMIQRCyh1k7/SgJvWyi9qg1LdyJApyPbolXP8DLvct5t8PGyQy3hDx8
UU3k0lQrOPO6HAmO5oXX2fYLKj6apKcuvK7wErTEKgVXfbIUE04RZBwrqztWvGWE
v/XwMM6XexMpbdE+prxnNfflloI6osahKMFfqjfBPM4SPluLJiwumRoFBKFgXm6D
lnvnZAKIeeBnV4GMFDj4AGZqyqBhl0ic/Dyed22MGmIGgJoYVCKBX9XfOnRTltlN
CwUnoZqZEmfLwn3aqgrDFzkWZrJT+N0ItERsTbG4aq6YNIPsJ1Mc8ogclqi7yWHr
FVX81yL4Tc9DBHh2AdXOUDhoFO8DbgMdmVmWFh2+vKmVm3CLO9g=
=GsBH
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -0,0 +1,2 @@
EBUILD amanda-0.ebuild 151 BLAKE2B 7d0bda5bde34d227c754592d99bb94b066de66735d8635ee0e95e4c1928a158937eda6867c3a2d1d17550d92a7b6354143a9d0d52044abe22ba39c8e0fed9a79 SHA512 dd7d28a1c50e181632de11a36197a4d022b742c5edd54ecf7bbece0d4d1a3df536521bb4c9e75012b3a4d95673d81babac3e242aa2383fd263152fd299434db7
MISC metadata.xml 648 BLAKE2B 438964525d71b19b0d8538d339e9b8e68c99a3ad6032a4ead75d6f6e90fdbbbc1c8f59c921e25ac550c519ec824043e54965a5abc6ecfd9dbfbcfacc8590b1f5 SHA512 9c2f3d4f7217de64250a148dafae4c8e2ad565b2a88ccebfe05a05f3bc349789ed3f06dfa08434018b53e086c4a2a02bb89224b476dd471371b5aa4c4aa38008

@ -0,0 +1,8 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=362

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
<maintainer type="person">
<email>lists@xunil.at</email>
<name>Stefan G. Weichinger</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<maintainer type="person">
<email>dustin@v.igoro.us</email>
<description>Upstream. Please CC on bugs.</description>
<name>Dustin J. Mitchell</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,2 @@
EBUILD sigh-0.ebuild 151 BLAKE2B 0ab7e99af571ef263ead1dd322a5f80f798927fc6551f30d39b7b428369f3688ceb5997a4d303430c027cbfbf101278741cc458a40f03f66078781ef84e21b55 SHA512 84f012812b0f710d47dd84d73ce0da3072ec6178eb5fa44518672bf52e1eac5446853c18c65baf3ff76cc80714753516da2cd85f3dd89b7a95c5a3cebd20993d
MISC metadata.xml 475 BLAKE2B 8bb668e126092bcf18ba8f3577861ddca556b2811771e9a3e6ae94ba5e548862c003e41f41afdb819c97f5ab25d37ee6ba165ceb71c1fefc96257c43a586a578 SHA512 e73ced717171aaab22791b3f44e4bcb8d580e3ed6f529a7992eb7d73c390aba57f0893ed9724bc8d3a1089111445eb1d148c5808b6a2658a25377769977c0efd

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>c@roessner.co</email>
<name>Christian Roessner</name>
</maintainer>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
<name>Marc Schiffbauer</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,8 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=363

@ -0,0 +1,2 @@
EBUILD unifi-video-0.ebuild 182 BLAKE2B acdde57c8ca76b2af1b269728498e4a82209e4bb9d74bff4384a9b40b08f49713cc5db1464dc1c46b58b10ea3806bb2b666df4d4723cd3ff6d04db085829f4b2 SHA512 51fdeaa4c241f45a7fd39bd22d39dfa71d631bbbf9e5141748f4d080e49b837c114dc50572e4bc0da355c886c9e0fa77011f88ebc969bb18205c4cdcb07666fc
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
<name>Ben Kohler</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,9 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
DESCRIPTION="Group for Unifi Video"
ACCT_GROUP_ID=348

@ -0,0 +1,2 @@
EBUILD ushare-0.ebuild 177 BLAKE2B 4bcb1e5aaa22ba3ce775f66c9274ad41cb8232805bd65d3a361eb45c7b84dd88d0282c2ea5acc3668112b20a0c9c60a844bf7bc9725b0ec596c87ed2fb33361c SHA512 2217e74204046f01a20397d9dd4e8f74a5a3012641b34fd9ec1f041c1a3678ccb9bf6b395a25b191f68e0a8f47b1757ecdcab38c4964e6edb6e17030cb4c897a
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
<name>Ben Kohler</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,9 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
DESCRIPTION="Group for uShare"
ACCT_GROUP_ID=349

Binary file not shown.

@ -0,0 +1,2 @@
EBUILD amanda-0.ebuild 231 BLAKE2B b4c12a48da158fb0e2e739525d4e11bc7ee17d166a76c984231cbaf2fb1483fd19033c15f4e5b6da8bc7c9f261bd7a5c493a3894d41c694b72b6e2f606d77554 SHA512 a335b75236e6471d744e6d853bd4303217f81c24a1420058bfd289c51ae2b1d1824e69f60b91cad17f897b3f0bf2186d58c720c9cc07f0d1dc303adce52931ba
MISC metadata.xml 648 BLAKE2B 438964525d71b19b0d8538d339e9b8e68c99a3ad6032a4ead75d6f6e90fdbbbc1c8f59c921e25ac550c519ec824043e54965a5abc6ecfd9dbfbcfacc8590b1f5 SHA512 9c2f3d4f7217de64250a148dafae4c8e2ad565b2a88ccebfe05a05f3bc349789ed3f06dfa08434018b53e086c4a2a02bb89224b476dd471371b5aa4c4aa38008

@ -0,0 +1,12 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
ACCT_USER_ID=362
ACCT_USER_GROUPS=( "${PN}" )
ACCT_USER_HOME=/var/spool/amanda
acct-user_add_deps

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
<maintainer type="person">
<email>lists@xunil.at</email>
<name>Stefan G. Weichinger</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<maintainer type="person">
<email>dustin@v.igoro.us</email>
<description>Upstream. Please CC on bugs.</description>
<name>Dustin J. Mitchell</name>
</maintainer>
</pkgmetadata>

@ -1,2 +1,2 @@
EBUILD root-0.ebuild 290 BLAKE2B 0d1064652d648faf6c2d84d3925fae75fc3fed129fdb0688abd7b5c3311e9a706c8b20f751c61fa775fc80336ca9cebfc9f7c665a38f5e4acd5399dc9a4e468b SHA512 1a6a8a3431d6e0bf387020b9566e7798d6f0fd5dd5f43298e678713c138ec16688d20c2f08fb285727bd44cd38c48b53d6fd59652b4786f675753d43a97c9fe3
EBUILD root-0-r1.ebuild 342 BLAKE2B 36bcf65b475ca1ceb6713b7ebd187087f9e12bba31a959fcc32a170acc704ba155b236b8ec77b32ebb3edf9be93180e26b9c8dba18d9545325d3a6e31b0fec51 SHA512 dbaabdb7cfde2715a215ab3e0bcb4bf625eb82c920f5dd9e31d6f4fd25a3a6583c8ef12be6ab442d9196f8171cc93ad8c0bebfe95b7047efb41a9b220cfd5e39
MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb

@ -13,3 +13,8 @@ ACCT_USER_HOME_PERMS=0700
ACCT_USER_GROUPS=( root )
acct-user_add_deps
pkg_prerm() {
# Don't lock out the superuser
:
}

@ -0,0 +1,2 @@
EBUILD sigh-0.ebuild 198 BLAKE2B c71e87d8818c692471fe73692046c8c84d9f00bfaf744cbeb9702e325f115fd0447199f5c09ca2c8a3dc3ffbbe6b35f98fbbad13494d647999e08fac1adad346 SHA512 b31a67ecacd9892817039947552de8f5d48e137ef7029b2299beedbd4bac1f9b809d94e080c952c0eb6ad2dab3de2637d247565c4c84579cb3ecf4c172e1be51
MISC metadata.xml 475 BLAKE2B 8bb668e126092bcf18ba8f3577861ddca556b2811771e9a3e6ae94ba5e548862c003e41f41afdb819c97f5ab25d37ee6ba165ceb71c1fefc96257c43a586a578 SHA512 e73ced717171aaab22791b3f44e4bcb8d580e3ed6f529a7992eb7d73c390aba57f0893ed9724bc8d3a1089111445eb1d148c5808b6a2658a25377769977c0efd

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>c@roessner.co</email>
<name>Christian Roessner</name>
</maintainer>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
<name>Marc Schiffbauer</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,11 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
ACCT_USER_ID=363
ACCT_USER_GROUPS=( "${PN}" )
acct-user_add_deps

@ -0,0 +1,2 @@
EBUILD unifi-video-0.ebuild 232 BLAKE2B b79e38c349bfec6cf716a2c32cb012b51fd47bbf5ac887c657601ec53e6ae2d5062fefd3663c60fe02437bcf3f5a14d2396123a2d301fe8f14844eacbfdd9b56 SHA512 6cdd7be966484189efaa482ac6cd673480c1036b7d814c3f1674ddb15a822ab1c18116e6d9bf41d4176ab7275e040440def5d8119364911e1e35914e2d6ec2d8
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
<name>Ben Kohler</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,12 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="User for Unifi Video"
ACCT_USER_ID=348
ACCT_USER_GROUPS=( unifi-video )
acct-user_add_deps

@ -0,0 +1,2 @@
EBUILD ushare-0.ebuild 222 BLAKE2B 100185b4ef76580c293e173d2b92ad08b91a7170340adda16e87622ca48dda5a6a287d2d7245be4763221dc21e574e664d70e67867f7937d35bd7e4611cc9947 SHA512 be905445552789caf076d3b4dfad08950add8e277bd2385d11fdc8709522e679501501a0d20d0aacd4330724b4eb940c55904ef83fb51b4508954d49dec2e227
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
<name>Ben Kohler</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,12 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="User for uShare"
ACCT_USER_ID=349
ACCT_USER_GROUPS=( ushare )
acct-user_add_deps

Binary file not shown.

@ -1,3 +1,5 @@
AUX edbrowse-3.7.5.1-fno-common.patch 508 BLAKE2B b7908cf4019500da7df9f37c59e76b204227fefc16e068a1f5f3454ba6c33f30f7740cf89f6d6a9d193e79fd4b35d8f9584bc43b89c888b339742f5708bb8d27 SHA512 8adaa0621546b24b471f1afe5c93991876320170619dae5babe48099a3ef14286914136efb6643924be84ab5b6d7f709f4f5728d117d45f502db3befe3e4195d
AUX edbrowse-3.7.5.1-manpage.patch 946 BLAKE2B 34ee1e54da6d1f980f8876bf43dff170136ce18fa216df14e9bb62b62bafb7d33b622a01df6fdc8db9af95e27d2149b0916e0e7834960e647919e1a237257cdb SHA512 5aa93520e1765db0cf38c9d85debed9e97f08f3941c104611850a5bb496d13882ab12d850eec509378ed8c878049c659af460a334eaa5dcce7ed48fa85d8b906
DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
EBUILD edbrowse-3.7.5.1-r1.ebuild 839 BLAKE2B 3f0b20041c958a443a9be97585cc0927ae5faa22b099409f6fcf6eb8c23f1e778f0200218c44e8739eeaf68ea552e06861adbe305e482efbf0942e56d49fe737 SHA512 96504cbabba0be6546ea50e52900c14bd77edb3c3829fec8689d1d5745546fba0c9e7214c13172f32e41ebe8efb6b95704faf8d559a909fe879cf8fd008deca3
EBUILD edbrowse-3.7.5.1-r1.ebuild 886 BLAKE2B 38f6650b7598f4eb1714d9bd86d54c7b6d746a7929faba54d7e358c18917e126609142a5f2b32f760556c332249ea3e7876514d91208a433e8dbb5f84044269f SHA512 4f34e911a860786541681d25f6d6899be9ce9820ca6516e634184a382950e45c2c5858feb813377f4133ef04ad00c844784a0a55c9827dc4092291888abafc18
MISC metadata.xml 265 BLAKE2B 333a998cb5ea96e582d48f5906deaf0a5af3b2b942c3100a2b0b2a100baa0ddc7952cceab5636f6d86759ceaf70f5647fec9b3015ec021cfbd1db02f6551a303 SHA512 33d21e1a3d9fc3a983a0cc5c55b3c1532f5cc63a358eb274e26f53efbb4bd64d25c0d067ce461c9f006592a5301875d41455454d9caa442cf49c5ca44bf79a0f

@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-utils
inherit cmake
DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
HOMEPAGE="http://edbrowse.org"
@ -15,24 +16,30 @@ IUSE="odbc"
RDEPEND="
app-text/tidy-html5
>=net-misc/curl-7.36.0
>=dev-libs/libpcre-7.8
>=sys-libs/readline-6.0
dev-lang/duktape:=
dev-libs/libpcre
net-misc/curl
sys-libs/readline:=
odbc? ( dev-db/unixODBC )"
DEPEND="${RDEPEND}"
BDEPEND="${RDEPEND}
BDEPEND="
dev-lang/perl
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-fno-common.patch
"${FILESDIR}"/${P}-manpage.patch
)
src_prepare() {
sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" CMakeLists.txt
cmake-utils_src_prepare
cmake_src_prepare
sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" CMakeLists.txt || die
}
src_configure() {
local mycmakeargs=(
-DBUILD_EDBR_ODBC=$(usex odbc)
)
cmake-utils_src_configure
cmake_src_configure
}

@ -0,0 +1,11 @@
--- a/src/eb.h
+++ b/src/eb.h
@@ -287,7 +287,7 @@ extern char *sslCerts; /* ssl certificates to validate the secure server */
extern int verifyCertificates; /* is a certificate required for the ssl connection? */
extern int displayLength; // when printing a line
extern int formatLineLength; // when formatting html
-bool formatOverflow;
+extern bool formatOverflow;
extern int webTimeout, mailTimeout;
extern uchar browseLocal;
extern bool sqlPresent; /* Was edbrowse compiled with SQL built in? */

@ -0,0 +1,23 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,19 +249,7 @@ if (UNIX)
endif()
# copy to build dir
configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
- # find 'gzip' - warn if not...
- find_program(GZIP_EXE gzip PATHS /bin )
- if (GZIP_EXE)
- # gzip it in place
- execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- INPUT_FILE edbrowse.1
- OUTPUT_FILE edbrowse.1.gz )
- # install it
- install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir})
- else ()
- message(WARNING "Unable to locate 'gzip'! No man page...")
- endif ()
+ install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
# install user guide
install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
endif ()

Binary file not shown.

@ -1,4 +1,4 @@
AUX cdist-6.9.2-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1
EBUILD cdist-6.9.2.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
AUX cdist-6.9.3-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
DIST cdist-6.9.3.tar.gz 1358492 BLAKE2B 04ec577629924b0a4356bfc44f0fbd3c7c8f0f15197b2fe8a62cde8e2089865a06c4d49366870be712bf0bc5d8f5c47f8c5ee3af602186ecef2c33e15af1b762 SHA512 3588cb7b98c78ff1671f1932474fd9c43e06ce075cfb0fa777903687f5ea84e7382da6014ea6230edad290de5175e3f000ea487831f1584b7efd4c97b8758dc2
EBUILD cdist-6.9.3.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c

@ -1,8 +1,6 @@
AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
EBUILD mcelog-173-r1.ebuild 1353 BLAKE2B 2bd8f0d4bc17feb9fa7435c1056443639777a35803379019cbdf05aaa93d82a152495b7ba3d914665ec57a28441d00a3bf077bf93929916403ad26e3b664caea SHA512 32155344fb55a5a12ff14f56d1c6b392d4cae1bba1fba2e77f219fa35f054f7c60a45917189bb63c37551f4308b90ca4cd17fda0b22f7bb532f9d9cc1c2bca19
EBUILD mcelog-173.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6

@ -1,10 +0,0 @@
[Unit]
Description=Machine Check Exception Logging Daemon
After=syslog.target
[Service]
ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
StandardOutput=syslog
[Install]
WantedBy=multi-user.target

@ -1,58 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit linux-info systemd toolchain-funcs
DESCRIPTION="A tool to log and decode Machine Check Exceptions"
HOMEPAGE="http://mcelog.org/"
SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
# TODO: add mce-inject to the tree to support test phase
RESTRICT="test"
pkg_pretend() {
if [[ ${MERGE_TYPE} != buildonly ]]; then
local CONFIG_CHECK="~X86_MCE"
kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
check_extra_config
fi
}
src_prepare() {
eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
"${FILESDIR}"/${PN}-129-debugflags.patch
eapply_user
tc-export CC
}
src_install() {
default
insinto /etc/cron.daily
newins ${PN}.cron ${PN}
insinto /etc/logrotate.d/
newins ${PN}.logrotate ${PN}
newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
dodoc *.pdf
}
pkg_postinst() {
einfo "The default configuration set is now installed in /etc/${PN}"
einfo "you might want to edit those files."
einfo
einfo "A sample cronjob is installed into /etc/cron.daily"
einfo "without executable bit (system service is the preferred method now)"
}

@ -1,5 +1,3 @@
DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
DIST ps_mem-3.13_p20200417.tar.gz 18472 BLAKE2B 43e04d0357458107fb25600024243baaec703124fc58a819c011c847a52ad6fb7384ef38a5aa965e3ae88288cca6c76a15819466839eb729a63c4492eaa4ec0d SHA512 9694cec5d696a42dfe2f60dd024f541283e2f52aafb499ee2e551574133262bb0fc4bf6eb0e7075fb1b129aff6cd8fe6968f411f56ee1d31eb6f9aebff2d9852
EBUILD ps_mem-3.13-r1.ebuild 676 BLAKE2B 2921f9ecbcec6bf8e3251362eefebdf0a3c9a36d150463a3104c1637adf876dd451e3aa742aa002955aeedc3536836fb963a78f0066d43362aae4cbbb62abd14 SHA512 95dbdfbd232d6a0415f8f825cb750ba6cf40facce0ead984de057063f045215746f3cc7f7d1f5ac0cfed1e01a0930d9d711c5f0639de7cc4244e1a2a98319ff4
EBUILD ps_mem-3.13_p20200417.ebuild 710 BLAKE2B c01955fdb268c5dee0b489532033c7a3f9a831feb019d67f088a6bdd0beb327116347d9fd6be1171bab7c0e0d4ea851c65cb3f8fb81c32ad7af84bfb758a5861 SHA512 a10823a34bead2a0299cd5e27fa6b75034f6e1b7fa554261c1d33dd6e9753907e905da024f6f35144b8a2b6a3a31813e6b6fbf6045a5bfa2b3f110b0dd8c71da
MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8

@ -1,28 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 vcs-snapshot
COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
DESCRIPTION="A utility to report core memory usage per program"
HOMEPAGE="https://github.com/pixelb/ps_mem"
SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 sparc x86"
IUSE=""
python_install() {
distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
}
python_install_all() {
distutils-r1_python_install_all
doman ${PN}.1
}

Binary file not shown.

@ -1,10 +1,6 @@
AUX 3.32-packages.match 645 BLAKE2B b3ebf8eab5fd5fd57a19af06d3728d09f77ebd1c76aebae2e2bebae13f8071a86e60f5534460239436befb3d43f59441bec42c2787d5c5ee3c4e439fac02ca32 SHA512 894aabfba489ddf5aaaccccc10d5b7198dc03577a36798e418ebc0aa2b12689e04c2ce97052e0e105eaf93799964ce8196a234ed69f50fa0cf572cc723232690
AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
EBUILD file-roller-3.36.3.ebuild 2176 BLAKE2B 6e5b451ec8ce8a4f43b59a5c51ddf2c7389489fe80549efede5ebb23463f699e9a27ee86932d1a43b011def4a7d0cb4327f3fd1959aca409df649fa08bd3d477 SHA512 b7de40066a28fb6761595db964f13d0b41710da2bb542a9a78740677b36ea4fcf3faff79a592090c11a1c3fb537718c667a2257b98f7109eb5b30d758da75a02
EBUILD file-roller-3.38.0.ebuild 2119 BLAKE2B 10345b6fbc51320329ecba9c26333faab979a61e9c204a385cb0d3e209298fa93e687c52f8d11a6ca44dab19253b2b425c43d60d5596f14132015cfd32f293f1 SHA512 b93f320df766fafef3deadfffdac670ba8df2088417a5b8740578b16be2e060129872dd84824d3283689397f1aded23fa2631c27105064d0fd63cd85f3d3e50f
MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf

@ -1,96 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
DESCRIPTION="Archive manager for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="libnotify nautilus packagekit"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
# pango used in fr-window
RDEPEND="
>=app-arch/libarchive-3:=
>=dev-libs/glib-2.36:2
>=dev-libs/json-glib-0.14
>=x11-libs/gtk+-3.13.2:3
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/pango
libnotify? ( >=x11-libs/libnotify-0.4.3:= )
nautilus? ( >=gnome-base/nautilus-2.22.2 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
dev-util/itstool
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
"
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
${PN} is a frontend for several archiving utilities. If you want a
particular archive format support, see ${HOMEPAGE}
and install the relevant package. For example:
7-zip - app-arch/p7zip
ace - app-arch/unace
arj - app-arch/arj
brotli - app-arch/brotli
cpio - app-arch/cpio
deb - app-arch/dpkg
iso - app-cdr/cdrtools
jar,zip - app-arch/zip and app-arch/unzip
lha - app-arch/lha
lzop - app-arch/lzop
lz4 - app-arch/lz4
rar - app-arch/unrar or app-arch/unar
rpm - app-arch/rpm
unstuff - app-arch/stuffit
zoo - app-arch/zoo"
PATCHES=(
# https://gitlab.gnome.org/GNOME/file-roller/merge_requests/31
"${FILESDIR}"/${PN}-3.32.4-fno-common.patch
)
src_prepare() {
# File providing Gentoo package names for various archivers
cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
xdg_src_prepare
}
src_configure() {
local emesonargs=(
-Drun-in-place=false
$(meson_use nautilus nautilus-actions)
$(meson_use libnotify notification)
$(meson_use packagekit)
-Dlibarchive=true
)
meson_src_configure
}
src_install() {
meson_src_install
readme.gentoo_create_doc
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
readme.gentoo_print_elog
}
pkg_postrm() {
xdg_pkg_postrm
gnome2_schemas_update
}

@ -1,34 +0,0 @@
[Package Matches]
arj=app-arch/arj
binutils=sys-devel/binutils
brotli=app-arch/brotli
bzip2=app-arch/bzip2
cpio=app-arch/cpio
dpkg=app-arch/dpkg
genisoimage=app-cdr/cdrtools
gzip=app-arch/gzip
lha=app-arch/lha
lrzip=app-arch/lrzip
lz4=app-arch/lz4
lzip=app-arch/lzip
lzma=app-arch/xz-utils
lzop=app-arch/lzop
ncompress=app-arch/ncompress
p7zip=app-arch/p7zip
p7zip-full=
p7zip-rar=
rar=app-arch/rar
rpm=app-arch/rpm
rzip=app-arch/rzip
zip=app-arch/zip
zoo=app-arch/zoo
tar=app-arch/tar
unace=app-arch/unace
unalz=
unarchiver=app-arch/unar
unrar=app-arch/unrar
unsquashfs=sys-fs/squashfs-tools
unstaff=
unzip=app-arch/unzip
xz=app-arch/xz-utils

@ -1,27 +0,0 @@
From 55fa0fb287e7fb7cee336cac0a6c1a94e505dc84 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Wed, 19 Feb 2020 13:18:18 +0100
Subject: [PATCH] Fix compiling with GCC 10
* GCC 10 defaults to `-fno-common`.
Bug: https://bugs.gentoo.org/706728
---
src/fr-application.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/fr-application.c b/src/fr-application.c
index c148c4f9..00ebe552 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -42,7 +42,6 @@
#define SERVICE_TIMEOUT 10
-gint ForceDirectoryCreation;
static char **remaining_args;
static char *arg_add_to = NULL;
static int arg_add = FALSE;
--
2.25.1

Binary file not shown.

@ -1,6 +1,5 @@
AUX amanda-3.3.9-stuck.patch 422 BLAKE2B e7eec8e49a61869f08ca19b913783204914c99dcb2b28465c30f5e5ac230ca3c043944f0a08477304aa7047c98846a6df113ad3daa513c11a084a2d90c13baca SHA512 8028505fd3f1946f13dae631bfd6a74f6d7688c658148a250e473ed85fd1268fae18278ede5f0499200cd84a2bc5481edb2d0f4fec2bab7a57528b9957396c42
AUX amanda-3.4.1-labelstr.patch 6224 BLAKE2B b1555f4356ad8f12259cad7bba7245d10b53cfbba88a75ead6cf73593996ae7d9fc2cf1e2f4dbebc381f20bc194b281e997d96a3a02b9bb2cb9094a5e3ace8a4 SHA512 337a5fd0eef9521932842248414f4402e8623122f4fb401e909750ec690019daf75b3018cc1c7b50a682bae7cd96187e1406fc7767a8b34297546abe70f0f035
AUX amanda-3.4.1-slots.patch 512 BLAKE2B 62f48e893a8683e4206a5123227a9745c6002dad1b82e02040ace26df7c0322db5616a27686fba4b1e2eb462b3a07433d8ba004cd3ff90702de0ea8567f8af6b SHA512 ce4fb2184b58c303ce785d661c740dfe25160f2ac1d87283414f4b8bbe6a464e123eea663f5505a3edc9d1542551fe06b744460ce395a4de14b679817a8a74b4
AUX amanda-3.5.1-fno-common.patch 428 BLAKE2B fcd2a7a2d9a6a121f81676e682606911a30b6077571e7d5aa4acb423e0a2ee50be09847566e4c38ac8a249ea729568b009a51b63ee15d53b4670653359c4f214 SHA512 66ec0c45849dcfd7ed35ace22d72f161995e80c85823eb244928862f199885f796fc7e276f14fadb1e0aace1410761e6c5f2305f8c8712fb880f80db69efa20e
AUX amanda-amandahosts-client-2.5.1_p3-r1 343 BLAKE2B 9aca710f5a94a4acf625ecc3e78007826797dc74102a8df3f03b0113b15b9dc588a2e82192f0e3a70ffbd51e2be2597a98218c93b316382a978768cf551afa95 SHA512 7c0c4fc6d18b37ee8c11e64f98074b93f52f1bdcb97949648ced82d83ada2ea688f79531efa4c3e596f7390770540f45a7b122bba862cbd5218f1b870594f751
AUX amanda-amandahosts-server-2.5.1_p3-r1 340 BLAKE2B 67f5de50dcf25204df2ff92b228aa76303ac69b07b31ff373fc644685f278f3e898e4e3a8e43e666ac0b64ebd61a41bb0e73db22d728a9988a93c6ea983ba29f SHA512 b11076634608c16cec4350364d60bcf3d22c12f07c0d8fab53d854e4fb21197eb016fb7f75d8153295ef9f997a3850fcd56b9fe268fa8dde5fd39d9dcbabb08b
AUX amanda-cron 419 BLAKE2B ecfff0377fd47fb6765fd98310b1c7d16d3caccada79503f8bb6e7ae0685bd08f38f526b32be12dd5c6c7ed71b8ada4e6b6c48ebff8fdc29e08e9fcf77ea0df9 SHA512 93aa1a6bcc66bc5147210bd0dd52ae664064cc708cbe59969a5bc9e783e4972841ad7cb89f3ae111ac7695c42e1b91f727890b8e58c4f8757f08e5eae90fb505
@ -16,19 +15,7 @@ AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd151596
AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
DIST amanda-3.4.1.tar.gz 5338575 BLAKE2B 286ca826cf80253fd4491b4e94db08cdeea9b13d115021859398ac940b55fb452561baa7545a5c8f3f973a0d595a220056e383a79577d1e9113a00960c9ba038 SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16
DIST amanda-3.4.2.tar.gz 5353734 BLAKE2B b7c2bc78a1900d0c87f93ff9eea5cd8a9cb5ad8484475424a6a05d951d9ea543e936bec2fab1624f8ee512dc0a3f87228e07c1720b9a6ddf37f5525ca54260c4 SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd
DIST amanda-3.4.3.tar.gz 5355137 BLAKE2B 920e34c50a624aeab8ed1e6a4555d6b6e34ede45a8d896892a562a5b82ebf4be17acc49ba688238bae0e374bed0c2be8e683974de574038565cf1e7ad1cb65f0 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a
DIST amanda-3.4.4.tar.gz 5363929 BLAKE2B a3da69f63c43ba4821a28d380262b99444c45dbfaa5ff748c6e4d0d452c1ad3e1d6a254dd27fec7afc7f4f8ba0a56c56d90192f1a5ba714ed83e26e52700f397 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96
DIST amanda-3.4.5.tar.gz 5365381 BLAKE2B 61c18603d48c4e9c647cfc7e185292e8764d62bd1ea9212da04958029cc87472872fa2e4a45ec52bb15f6342d2f3e41e486a6618024f775dbedffcc762190ae4 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c
DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
DIST amanda-3.5.tar.gz 5386719 BLAKE2B 93a382a9091ec7cfc5f21fe7131a6bf0c1aceb169a2274ce66c1f77a08b594beeca430687a6a28403d8cc35e85beecce99fde9c2d7d34c8460999a3ca63937f1 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c
EBUILD amanda-3.3.9.ebuild 16116 BLAKE2B 9f3df218e3a1eea9710db3d9b110af828637079eb50ed1ee711afe22707681481e9dbaa61929de68ce8b4b7810a6dea215efc6f20a78970ebcb27913abe36e04 SHA512 5c8e6aca768b18d43b7fe468f1b41aacb362e70a2917b472e46e7c1a951b2e0011217fb381b51aa41e90f8db16830acecf32cc134886c3fee6641fed4447e168
EBUILD amanda-3.4.1.ebuild 16578 BLAKE2B 5c0b2cfd08547fdacc0f1181c9547d7f46c8585654e791818c0277c28290abac06325096eb15081b3bd27278cbc4549225775a37129b759e65d838f73d971bed SHA512 559476f434432cda1d0b498c4234459a67e15c76b5550a4997da95288469a19357564ef6210f10761bf06daef8101f25b4cd78843af200e779243f76605c32f6
EBUILD amanda-3.4.2.ebuild 16484 BLAKE2B 3b55291da684dff44dcf9bfcc4ce9683d98cdc006d3860ccf6bffb52e531370b506bfb9639927c8f5e28da4b526aea5aafd307a773ff7ecbf8e237b368b23163 SHA512 60a908ac418facd9bda57d99e892fb4de2f878a8669492d59d993f080d69067407bcebe15dcf8bcf11ceb11b5505a624906e21a3821aed9e66813befcd6d5793
EBUILD amanda-3.4.3.ebuild 16484 BLAKE2B 3b55291da684dff44dcf9bfcc4ce9683d98cdc006d3860ccf6bffb52e531370b506bfb9639927c8f5e28da4b526aea5aafd307a773ff7ecbf8e237b368b23163 SHA512 60a908ac418facd9bda57d99e892fb4de2f878a8669492d59d993f080d69067407bcebe15dcf8bcf11ceb11b5505a624906e21a3821aed9e66813befcd6d5793
EBUILD amanda-3.4.4.ebuild 16484 BLAKE2B 3b55291da684dff44dcf9bfcc4ce9683d98cdc006d3860ccf6bffb52e531370b506bfb9639927c8f5e28da4b526aea5aafd307a773ff7ecbf8e237b368b23163 SHA512 60a908ac418facd9bda57d99e892fb4de2f878a8669492d59d993f080d69067407bcebe15dcf8bcf11ceb11b5505a624906e21a3821aed9e66813befcd6d5793
EBUILD amanda-3.4.5.ebuild 16484 BLAKE2B 3b55291da684dff44dcf9bfcc4ce9683d98cdc006d3860ccf6bffb52e531370b506bfb9639927c8f5e28da4b526aea5aafd307a773ff7ecbf8e237b368b23163 SHA512 60a908ac418facd9bda57d99e892fb4de2f878a8669492d59d993f080d69067407bcebe15dcf8bcf11ceb11b5505a624906e21a3821aed9e66813befcd6d5793
EBUILD amanda-3.5-r1.ebuild 16951 BLAKE2B 02d0d172fd83bb4a3fbcd380172bdff39c9c8dfd8db15b10454c99174862d256510f917cb3d98a585f73114b86502f27292317e13c4e33e3be38771e2863f90b SHA512 9b6b3bb6243dfc602612be3733e1a6994e647acfb6a93b1f0b5f095e324044321dafc49711df2c860ae79fdb8fa951d8adec1a5867a081b33de9a1330e00b033
EBUILD amanda-3.5.1-r1.ebuild 17073 BLAKE2B 6ec26a15660ce0da8533da714b8e79d360c0c6ec06c5bb5b635fa4797537c03c69582ed40ba5972049535e0a527b1d24009dba5a5d68248e3244f3585fb8685d SHA512 893d78ccb8deaa7597e15e594d2240a7a2697622b08c109abbfa6183dee90a15df78ea9799550be1d09efac2348c9a0aa99a7927a6c016f69560cb3125eaefb7
EBUILD amanda-3.5.1-r2.ebuild 16459 BLAKE2B 8e7996e78db176168d5255ff0da9ca43e43221f5dd36b666305fc7328a56a8cfe15e5ae8773f956b8036f97cd58d491d98a0927aed432484e095c63bbd129abc SHA512 bcc726867507b7131e52c7116b7c254b8937857fbad062a0980cbe48e883ca6c382a72053440dac46e47cf7d271d4c094640fd6e2142ee53b8b2a12bb059392b
MISC metadata.xml 951 BLAKE2B 8d3f922a8e395fab343e60d31525a3faa386aebdc2b0548e37037855aab88df4b27f639672e290540bc4746024f43e2da7db853b1d9446d13744c3161a293848 SHA512 0485a881c4592e201c4130ca9bc62499a8933f77a4a4431148c647b420c022404b218896c525ab062cc40f4c386082eed25f2d38ee5bcb5cdeacc0b21c1f8230

@ -1,487 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply "${FILESDIR}"/${P}-slots.patch || die
eapply "${FILESDIR}"/${P}-labelstr.patch || die
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket || die
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,484 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket || die
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,484 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket || die
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,484 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket || die
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,484 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket || die
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,498 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
app-arch/tar
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
# What tar to use
[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
}
pkg_setup() {
amanda_variable_setup
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
default_src_unpack
}
src_prepare() {
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}" || die
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
if use minimal; then
cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
else
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
server-src/am{addclient,serverconfig}.pl || die
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
fi
eapply_user
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
# fix bug #376169
addpredict /run/blkid
addpredict /etc/blkid.tab
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 5
myconf="${myconf} $(use_with kerberos krb5-security)"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# libcurl is required for S3 but otherwise optional
if ! use s3; then
myconf="${myconf} $(use_with curl libcurl)"
fi
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perl_set_version
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
# Bug #636262
myconf="${myconf} $(use_with ndmp ndmp)"
# bug #483120
tc-export AR
econf \
$(use_with readline) \
${myconf}
}
src_compile() {
# Again, do not want the perl-module src_compile
default_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
emake DESTDIR="${D}" install
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket
systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
fi
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perl_set_version
find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "systemd-users: enable and start amanda.socket or the relevant services"
elog "regarding what auth method you use."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
elog "The only exception is when you use the authentication method 'local'."
elog
elog "Please note that this package no longer explicitly depends on"
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
local i
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
[ -e "${root}"/${i} ] || continue
chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
chmod u=srwx,g=rx,o= "${root}"/${i} || die
done
# amanda-security.conf is a config file with similar requirements:
# writable only by root
# world-readable
# 3.3.9: introduced in /etc/amanda-security.conf
# 3.4.2: moved to /etc/amanda/amanda-security.conf
f=/etc/amanda/amanda-security.conf
chown root:root "${root}""${f}" || die
chmod u=rw,go=r "${root}""${f}" || die
}
# We do not want the perl-module tests.
src_test() {
default_src_test
}

@ -1,8 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools perl-module user systemd toolchain-funcs
EAPI=7
inherit autotools perl-module systemd toolchain-funcs
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
@ -13,39 +14,43 @@ SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline:=
virtual/awk
DEPEND="
acct-group/amanda
acct-user/amanda
app-arch/dump
app-arch/tar
dev-libs/glib:2
dev-lang/perl:=
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
dev-perl/JSON
dev-perl/Encode-Locale
dev-perl/JSON
net-misc/openssh
sys-libs/readline:=
virtual/awk
kerberos? ( app-crypt/mit-krb5 )
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba:= )
kerberos? ( app-crypt/mit-krb5 )
s3? ( net-misc/curl )
!s3? ( curl? ( net-misc/curl ) )
xfs? ( sys-fs/xfsdump )
!minimal? (
dev-perl/XML-Simple
virtual/mailx
app-arch/mt-st:=
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
dev-perl/XML-Simple
sys-block/mtx
virtual/mailx
gnuplot? ( sci-visualization/gnuplot )
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
RDEPEND="${DEPEND}"
BDEPEND="
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd
dev-libs/libxslt
dev-lang/swig
"
dev-libs/libxslt
virtual/pkgconfig
nls? ( sys-devel/gettext )"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
@ -59,8 +64,8 @@ TMPENVFILE="${T}/${ENVDFILE}"
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_HOMEDIR
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
@ -75,13 +80,9 @@ amanda_variable_setup() {
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
AMANDA_GROUP_NAME=amanda
AMANDA_USER_NAME=amanda
AMANDA_USER_HOMEDIR=/var/spool/amanda
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
@ -127,9 +128,6 @@ pkg_setup() {
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
@ -138,15 +136,16 @@ src_unpack() {
}
src_prepare() {
default
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
sed -i '/^check-local: check-perl$/d' config/automake/scripts.am || die
sed -i '/^check-local:/s,syntax-check,,g' perl/Makefile.am || die
# bug with glibc-2.16.0
sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
sed -i -e '/gets is a security/d' gnulib/stdio.in.h || die
# https://bugs.gentoo.org/701416 sandbox violation
sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' "${S}"/config/amanda/dumpers.m4 || die
sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' config/amanda/dumpers.m4 || die
eautoreconf
@ -347,7 +346,7 @@ src_install() {
if ! use minimal; then
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
newins "${MYFILESDIR}"/amanda-cron amanda
fi
insinto /etc/amanda
@ -355,10 +354,10 @@ src_install() {
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
dosym "${AMANDA_USER_HOMEDIR}/.amandahosts" /etc/amanda/amandahosts
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
newins "${MYFILESDIR}"/amanda-profile .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
@ -376,8 +375,7 @@ src_install() {
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
for i in "${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
@ -385,8 +383,8 @@ src_install() {
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
if ! use minimal ; then
fperms 0700 \
@ -411,9 +409,9 @@ src_install() {
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
newdoc "${FILESDIR}"/example_global.conf global.conf
einfo "Cleaning up dud .la files"
perl_set_version

@ -1,164 +0,0 @@
diff --git a/installcheck/Amanda_Rest_Storages.pl b/installcheck/Amanda_Rest_Storages.pl
index f3c699b..3e4e889 100644
--- a/installcheck/Amanda_Rest_Storages.pl
+++ b/installcheck/Amanda_Rest_Storages.pl
@@ -308,6 +308,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
'inventory' => [
{'current' => 1,
'label' => "DISKFLAT-001",
+ 'label_match' => '1',
'device_status' => '0',
'reserved' => 0,
'f_type' => '1',
@@ -467,6 +468,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
'label' => 'DISKFLAT-001',
'datestamp' => '20140509113436',
'write_protected' => '',
+ 'label_match' => '1',
'process' => 'Amanda::Rest::Storages',
'running_on' => 'amanda-server',
'component' => 'rest-server',
diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl
index 1a3527f..700c5a2 100644
--- a/installcheck/amtape.pl
+++ b/installcheck/amtape.pl
@@ -177,13 +177,13 @@ like($Installcheck::Run::stderr,
ok(run('amtape', 'TESTCONF', 'show'),
"'amtape TESTCONF show'");
like($Installcheck::Run::stderr,
- qr/slot +2:.*label MyTape\nslot +3/,
+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
"'amtape TESTCONF show' ..result correct");
ok(run('amtape', 'TESTCONF', 'show', '2'),
"'amtape TESTCONF show'");
like($Installcheck::Run::stderr,
- qr/^slot +2:.*label MyTape$/,
+ qr/^slot +2:.*label MyTape \(label do not match labelstr\)$/,
"'amtape TESTCONF show 2' ..result correct");
ok(run('amtape', 'TESTCONF', 'show', '1,3'),
@@ -252,13 +252,13 @@ like(run_err('amtape', 'TESTCONF', 'update'),
ok(run('amtape', 'TESTCONF', 'show'),
"'amtape TESTCONF show'");
like($Installcheck::Run::stderr,
- qr/slot +2:.*label MyTape\nslot +3/,
+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
"..result correct");
ok(run('amtape', 'TESTCONF', 'inventory'),
"'amtape TESTCONF inventory'");
like($Installcheck::Run::stdout,
- qr/slot +1: blank\nslot +2: label MyTape \(current\)\nslot +3/,
+ qr/slot +1: blank\nslot +2: label MyTape \(current\) \(label do not match labelstr\)\nslot +3/,
"..result correct");
ok(run('amtape', 'TESTCONF', 'taper'),
diff --git a/perl/Amanda/Changer.pm b/perl/Amanda/Changer.pm
index 92ed9b6..4b4aad4 100644
--- a/perl/Amanda/Changer.pm
+++ b/perl/Amanda/Changer.pm
@@ -60,9 +60,10 @@ sub local_message {
} elsif ($self->{'code'} == 1100014) {
return "$self->{'err'}";
} elsif ($self->{'code'} == 1100015) {
- return sprintf("slot %3s: date %-14s label %s%s", $self->{'slot'},
+ return sprintf("slot %3s: date %-14s label %s%s%s", $self->{'slot'},
$self->{'datestamp'}, $self->{'label'},
- $self->{'write_protected'}?" (Write protected)":"");
+ $self->{'write_protected'}?" (Write protected)":"",
+ $self->{'label_match'}?"":" (label do not match labelstr)");
} elsif ($self->{'code'} == 1100016) {
return sprintf("slot %3s: unlabeled volume%s", $self->{'slot'},
$self->{'write_protected'}?" (Write protected)":"");
@@ -2014,6 +2015,13 @@ sub show {
my $st = $dev->read_label();
my $write_protected = !$dev->check_writable();
if ($st == $DEVICE_STATUS_SUCCESS) {
+ my $label_match = match_labelstr(
+ $self->{'storage'}->{'labelstr'},
+ $self->{'storage'}->{'autolabel'},
+ $dev->volume_label(),
+ $res->{'barcode'},
+ $res->{'meta'},
+ $self->{'storage'}->{'storage_name'});
$params{'user_msg'}->(Amanda::Changer::Message->new(
source_filename => __FILE__,
source_line => __LINE__,
@@ -2022,7 +2030,8 @@ sub show {
slot => $last_slot,
datestamp => $dev->volume_time(),
label => $dev->volume_label(),
- write_protected => $write_protected));
+ write_protected => $write_protected,
+ label_match => $label_match));
} elsif ($st == $DEVICE_STATUS_VOLUME_UNLABELED) {
$params{'user_msg'}->(Amanda::Changer::Message->new(
source_filename => __FILE__,
diff --git a/perl/Amanda/Rest/Storages.pm b/perl/Amanda/Rest/Storages.pm
index 680115b..b1b59d2 100644
--- a/perl/Amanda/Rest/Storages.pm
+++ b/perl/Amanda/Rest/Storages.pm
@@ -436,6 +436,17 @@ sub inventory {
$inv->{'retention_type'} = $tl->get_retention_name($retention_type);
}
}
+ for my $inv (@$inventory) {
+ if ($inv->{label}) {
+ $inv->{'label_match'} = Amanda::Util::match_labelstr(
+ $storage->{'labelstr'},
+ $storage->{'autolabel'},
+ $inv->{'label'},
+ $inv->{'barcode'},
+ $inv->{'metae'},
+ $storage->{'storage_name'});
+ }
+ }
push @result_messages, Amanda::Changer::Message->new(
source_filename => __FILE__,
source_line => __LINE__,
diff --git a/server-src/amtape.pl b/server-src/amtape.pl
index b63607e..d06eefe 100644
--- a/server-src/amtape.pl
+++ b/server-src/amtape.pl
@@ -30,7 +30,7 @@ use Text::Wrap;
use Amanda::Device qw( :constants );
use Amanda::Debug qw( :logging );
use Amanda::Config qw( :init :getconf config_dir_relative );
-use Amanda::Util qw( :constants );
+use Amanda::Util qw( :constants match_labelstr );
use Amanda::Storage;
use Amanda::Changer;
use Amanda::Constants;
@@ -219,6 +219,7 @@ sub {
for my $sl (@$inv) {
my $line = "slot $sl->{slot}:";
my $tle;
+ my $meta;
if ($sl->{'state'} == Amanda::Changer::SLOT_EMPTY) {
$line .= " empty";
} elsif (!defined($sl->{device_status}) && !defined($sl->{label})) {
@@ -230,6 +231,7 @@ sub {
if (defined $tle) {
if ($tle->{'meta'}) {
$line .= " ($tle->{'meta'})";
+ $meta = $tle->{'meta'};
}
}
} elsif ($sl->{'device_status'} == $DEVICE_STATUS_VOLUME_UNLABELED) {
@@ -263,6 +265,15 @@ sub {
$line .= " [device error]";
}
}
+ if ($sl->{'label'}) {
+ if (!match_labelstr($storage->{'labelstr'},
+ $storage->{'autolabel'},
+ $sl->{label},
+ $sl->{'barcode'}, $meta,
+ $storage->{'storage_name'})) {
+ $line .= " (label do not match labelstr)";
+ }
+ }
if (defined $tle) {
my $retention_type = Amanda::Tapelist::get_retention_type($tle->{pool}, $tle->{label});
$line .= " [" . $tl->get_retention_name($retention_type) . "]";

@ -1,16 +0,0 @@
diff --git a/perl/Amanda/Changer/aggregate.pm b/perl/Amanda/Changer/aggregate.pm
index a2bd962..ecf9d28 100644
--- a/perl/Amanda/Changer/aggregate.pm
+++ b/perl/Amanda/Changer/aggregate.pm
@@ -391,7 +391,10 @@ sub info_key {
my $kid = 0;
for (@$kid_results) {
my ($err, %kid_info) = @$_;
- next unless exists($kid_info{'slots'});
+ if (!exists($kid_info{'slots'})){
+ $kid++;
+ next;
+ }
my $kid_slots = $kid_info{'slots'};
push @slots, map "$kid:$_", @{$kid_slots};
$kid++;

@ -0,0 +1,13 @@
diff --git a/common-src/testutils.h b/common-src/testutils.h
index 31f8973..3bb376f 100644
--- a/common-src/testutils.h
+++ b/common-src/testutils.h
@@ -75,7 +75,7 @@ typedef struct TestUtilsTest {
#define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); }
/* Is debugging enabled for this test run? (set internally) */
-int tu_debugging_enabled;
+extern int tu_debugging_enabled;
/*
* Main loop

@ -1,5 +1,3 @@
DIST backupninja-1.0.1.tar.gz 167991 BLAKE2B 736ded9f562e894ec74e78afb9677f61889c18310b5aabe76dab7aafd550653281fc8641b416c022d49062261d67f8e6ed2aeef9c9b7054b3538c5be983bf424 SHA512 24b898526c1efa91cde6b1a0f0f7c0820c7db5b11ea36f458b45a91e94adfc77636421d7ad2245c196999886a06a3be43253e52654bc07423b1ac5571275c580
DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
EBUILD backupninja-1.0.1-r1.ebuild 605 BLAKE2B 2c657be45da26c37910991398a4a791ad0a8e76f466eb88caac0168b2a4b8373de5ca6ebfa850c3ca0d746c0517f9004dd2f683ff307f00544eb4938df50635b SHA512 42dac334eb042c714b93cfd2ac40cfcb079fd78366a431050f8025b51064165f9c9bb3b99cdf86c62f2288d0dcfa399d76819260906033a8479588136f3c46fa
EBUILD backupninja-1.1.0.ebuild 542 BLAKE2B cd2d70a5f52e44cd916647565a565a88fb9a9850a7a881675ab39870ae8ecc81e134682f786af97235b03591552ad701e04923fe44274d76fc014dbda5a9ff91 SHA512 3537e26e1567f887855f40e52066a8249bd8994ceb197e461b05cc49fd53e80ea51c6d2d42f6f3ed81e6c7e24ed601c49a9601258e4aa94b2d583752c9963e43
MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8

@ -1,29 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
# This thing change with every release, how idiotic...
NODE_NUMBER=275
DESCRIPTION="lightweight, extensible meta-backup system"
HOMEPAGE="http://riseuplabs.org/backupninja/"
SRC_URI="https://labs.riseup.net/code/attachments/download/${NODE_NUMBER}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND="dev-util/dialog"
DEPEND=""
src_prepare() {
default
mv configure.in configure.ac
eautoreconf
}
src_configure() {
econf --localstatedir=/var #578614
}

Binary file not shown.

@ -1,3 +1,4 @@
AUX dvdisaster-0.79.5-fno-common.patch 538 BLAKE2B c50640bd957b1545fde6692920c4fd1a1877a0da6f03aca61eb03e8b0c2e4af72b82c8a9b4f769ab45f0627f9537b70ec188eb5f4f3a57168c9b3024770a9a60 SHA512 0e2c1dd7b48553975df2f3c2d56c811a489aae8dd65a3f57a544eab7c01d9b9022c1574d92a8210a1fef0fc8f44948509c6abf19d64bd3b871c1dc480c25b71f
DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
EBUILD dvdisaster-0.79.5.ebuild 1728 BLAKE2B 5b2e6687ec1f3771b567bb6105cfb87a25f0d8d9e3a25188f76756fb97a55578f83d9d684536a3b8a3dbd27b005d30cb58357bfaa2f58272f27efa7c0239c2df SHA512 c18c942b7b23403942784c2184e65ec7362a4ca4a564f40fc31e7faa73e5144632844d4b79853ac58c2715345650c885ccbebd826035330959fc8cc9a854135e
EBUILD dvdisaster-0.79.5.ebuild 1758 BLAKE2B 9582d5699d786c9225b7fda3b58e18df6dd7842776d83e5a8fbb17968c9529b6198100707dd14989eb6596f5a96474fc9d3759cb6326acd89c640616b67952e7 SHA512 4bbd2439324a0f31fd8a16e79290f2654dba80d538f6569150a860058af12badd735cc458734a8f9634b627d01029c0831a98f6480b26469b8a17cbc06a17350
MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716

@ -1,12 +1,13 @@
# Copyright 1999-2018 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit desktop gnome2-utils toolchain-funcs
EAPI=7
inherit desktop toolchain-funcs xdg
DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
HOMEPAGE="http://dvdisaster.net/"
SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
SRC_URI="http://dvdisaster.net/downloads/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
@ -20,28 +21,31 @@ done
unset dvdi_lang
RDEPEND="
>=dev-libs/glib-2.32:2
nls? ( virtual/libintl )
>=x11-libs/gtk+-2.6:2
dev-libs/glib:2
x11-libs/gdk-pixbuf
"
DEPEND="${RDEPEND}
x11-libs/gtk+:2
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
BDEPEND="
nls? ( sys-devel/gettext )
virtual/os-headers
virtual/pkgconfig
"
virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
DOCS=( CHANGELOG CREDITS.en README README.MODIFYING TODO TRANSLATION.HOWTO )
src_configure() {
./configure \
--prefix=/usr \
--bindir=/usr/bin \
--mandir=/usr/share/man \
--docdir=/usr/share/doc \
--prefix="${EPREFIX}"/usr \
--bindir="${EPREFIX}"/usr/bin \
--mandir="${EPREFIX}"/usr/share/man \
--docdir="${EPREFIX}"/usr/share/doc \
--docsubdir=${PF} \
--localedir=/usr/share/locale \
--localedir="${EPREFIX}"/usr/share/locale \
--buildroot="${D}" \
--with-nls=$(usex nls) \
--with-memdebug=$(usex debug) || die
--with-memdebug=$(usex debug) \
--with-nls=$(usex nls) || die
}
src_compile() {
@ -49,7 +53,7 @@ src_compile() {
}
src_install() {
DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default
default
newicon contrib/${PN}48.png ${PN}.png
make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
@ -59,7 +63,7 @@ src_install() {
newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
done
local dest="${D}"usr/share
local dest="${ED}"/usr/share
local dvdi_lang
for dvdi_lang in ${dvdi_langs}; do
@ -69,8 +73,5 @@ src_install() {
${dest}/man/${dvdi_lang/-/_} || die
done
rm -f "${D}"usr/bin/*-uninstall.sh || die
rm ${ED}/usr/bin/*-uninstall.sh || die
}
pkg_postinst() { gnome2_icon_cache_update; }
pkg_postrm() { gnome2_icon_cache_update; }

@ -0,0 +1,24 @@
--- a/dvdisaster.h
+++ b/dvdisaster.h
@@ -425,9 +425,9 @@ typedef struct _CrcBlock
*** forward declarations
***/
-struct _RawBuffer *rawbuffer_forward;
-struct _DefectiveSectorHeader *dsh_forward;
-struct _DeviceHandle *dh_forward;
+extern struct _RawBuffer *rawbuffer_forward;
+extern struct _DefectiveSectorHeader *dsh_forward;
+extern struct _DeviceHandle *dh_forward;
/***
*** bitmap.c
@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*);
*** build.h
***/
-int buildCount;
+extern int buildCount;
/***
*** cacheprobe.h

Binary file not shown.

@ -1,7 +1,4 @@
DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
EBUILD zulucrypt-5.1.0.ebuild 1026 BLAKE2B bfe0ea6f75dfc510f6eff072ebe0b1044b8939100579a4eafcb018e2d1e6dcf807880429da953bd7a4accea790b24ef9ba1d25b5ffe8671921ec815f5e9abee2 SHA512 d2eecbd4d4369acd7037fd3f318ff8c7a30965d0a8166c9fa1e8a4195410d0197a1cdb57f59cf606cea720939e9bf5f6dd923e114f9a971d56458dd4d64cead3
EBUILD zulucrypt-5.4.0.ebuild 1083 BLAKE2B 0bffbf733aa810c08c599a8fdcf004ffe12ecac1f12ab92cbf499acc6fd852465224aecdeba8935ec906068c038d209b96a2a4a5caabc03b92ccc180e9d011e8 SHA512 8afff3e935c2ffefd2133dcaa8f9c9ec17a68f11b8ffaa83f99d97dc8e6542c14933e16b034a906d42ffacc820669c8da5b3298534f91e095c93403341e8afe6
EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1144 BLAKE2B 6653aa2a2519aeb567f95a1f77b70ec1fb134a3277dcb2a668bb0be5a995e914a7260c73c2f31b2fbef1b60ee9c69617ddb29a6c2d0bb2c1a640d052f94b6528 SHA512 aeac169cc31a0da4ef03add49543f64a943f9b5dddea719e531a4387ac04c3ea2650d573798acdb3d808442415e2864838eb2f1f98f53bc477e1a3af707faded
AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1132 BLAKE2B 1245f868fd6fff5c010d03ac6c41b441de23b6d8a5db046d8748a2827ff0f64c84338006d8a95bfe27799c9e44c747de8577f099eff9ad3415586c22df418964 SHA512 ef29713207100695fc5e5b5c4d49707d165f01ef2e823818f9ba1c561b4cd6428c58bc74606bb662230fac48634b368083b300ffd2310bc6de02bf8150ffc0ba
MISC metadata.xml 697 BLAKE2B 905f662853dcdf92e5ab202e0bc832665f75827638a3217bc9a45ea3078ccc3ba5f9b6a95b2caf36d1d6d87f9617e69e706dafd06ac8758bb93c46bcf2eb9399 SHA512 9e1ed2f8bde794ea6b21e3129f6952a715e110cd06227a385dd3655fa7c0e7fe300f4aefbde827f842c9972ed39d1e908dd80d5bef5cd5c18bb27779006e09fe

@ -0,0 +1,11 @@
--- a/zuluCrypt-cli/bin/security.h
+++ b/zuluCrypt-cli/bin/security.h
@@ -35,7 +35,7 @@ extern "C" {
* set the function to be called when an attempt to evelate or downgrade privileges fail
* zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c
*/
-void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
+extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ;

@ -1,49 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils xdg
DESCRIPTION="Front end to cryptsetup"
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome kwallet +qt5 udev"
REQUIRED_USE="kwallet? ( qt5 )"
CDEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
gnome? ( app-crypt/libsecret )
qt5? (
dev-libs/libpwquality
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
kwallet? ( kde-frameworks/kwallet:5 )
)
"
RDEPEND="${CDEPEND}
udev? ( virtual/udev )"
DEPEND="${CDEPEND}
virtual/pkgconfig
"
S="${WORKDIR}/zuluCrypt-${PV}"
src_configure() {
local mycmakeargs=(
-DLIB_SUFFIX="$(get_libdir)"
-DNOGNOME=$(usex !gnome)
-DNOKDE=$(usex !kwallet)
-DNOGUI=$(usex !qt5)
-DUDEVSUPPORT=$(usex udev)
)
cmake-utils_src_configure
}

@ -1,51 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils xdg
DESCRIPTION="Front end to cryptsetup"
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome kwallet +qt5 udev"
REQUIRED_USE="kwallet? ( qt5 )"
CDEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
gnome? ( app-crypt/libsecret )
qt5? (
dev-libs/libpwquality
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
kwallet? ( kde-frameworks/kwallet:5 )
)
"
RDEPEND="${CDEPEND}
udev? ( virtual/udev )"
DEPEND="${CDEPEND}
virtual/pkgconfig
"
S="${WORKDIR}/zuluCrypt-${PV}"
src_configure() {
local mycmakeargs=(
-DLIB_SUFFIX="$(get_libdir)"
-DNOGNOME=$(usex !gnome)
-DNOKDE=$(usex !kwallet)
-DNOGUI=$(usex !qt5)
-DUDEVSUPPORT=$(usex udev)
-DINTERNAL_LXQT_WALLET=true
-DINTERNAL_ZULUPLAY=true
)
cmake-utils_src_configure
}

@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit cmake-utils xdg
inherit xdg cmake
DESCRIPTION="Front end to cryptsetup"
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="gnome kwallet +qt5 udev"
REQUIRED_USE="kwallet? ( qt5 )"
CDEPEND="
DEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
gnome? ( app-crypt/libsecret )
@ -28,17 +28,14 @@ CDEPEND="
dev-qt/qtwidgets:5
kwallet? ( kde-frameworks/kwallet:5 )
)"
RDEPEND="
${CDEPEND}
RDEPEND="${DEPEND}
udev? ( virtual/udev )"
DEPEND="
${CDEPEND}
virtual/pkgconfig"
BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_configure() {
local mycmakeargs=(
-DLIB_SUFFIX="$(get_libdir)"
@ -47,8 +44,7 @@ src_configure() {
-DNOGUI=$(usex !qt5)
-DQT5=true
-DUDEVSUPPORT=$(usex udev)
-DINTERNAL_LXQT_WALLET=true
-DINTERNAL_ZULUPLAY=true
)
cmake-utils_src_configure
cmake_src_configure
}

Binary file not shown.

@ -1,3 +1,5 @@
DIST conmon-2.0.20.tar.gz 64716 BLAKE2B d7eb464f5be0b117824571134f08077955f56e1637dd2cbc6b70413dc9a6f109a1b9b207f5523103f205659ac20cc65f5f2340475d771fdf4b852d6895887975 SHA512 b719e41e1ead0d38c0874a30901c5660dc8612dc7aa1c025068480846a1e458a744b55bb8d5d74d2c2ce38fdbbe03505fce216a2f2c0748740983e3272a82f0e
DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
EBUILD conmon-2.0.20.ebuild 991 BLAKE2B 0f8d190d49a770b2438332c85b5de73427ff9b7f7ad1af199d63b972abb3003c5fdc9004be4a9e0bd8898257c80d26a533f5f5aafd99be6baf480ca4851cdc46 SHA512 8a6ceb7f1b5fc42638b5e43545a963676619884591950897a1e2ed001e1813de8a015f6e22e4b66502a31d69918d149c43c9fdb84481c2320ad9d26a1b028c09
EBUILD conmon-2.0.22.ebuild 991 BLAKE2B 4e14a1ab6b57867e42181d7fe6e7a3e109814a81a1534e8035ef293d3faf48979110acacf65ca341ddaf2c0c2c9adc6ca13ce3ad127ded49f1a740c34fb0783c SHA512 48d8789d9834813dd9c83c378d081e3239ccad9616f19adeeb2b0a91650fa5d17440a8bc1c99c08555f5d8422807616cb9cf4b82c5244b3092856c0fd60e208e
MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775

@ -0,0 +1,45 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EGIT_COMMIT="9c34a8663b85e479e0c083801e89a2b2835228ed"
DESCRIPTION="An OCI container runtime monitor"
HOMEPAGE="https://github.com/containers/conmon"
SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="systemd"
RESTRICT="test"
RDEPEND="dev-libs/glib:=
systemd? ( sys-apps/systemd:= )"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
src_prepare() {
default
if ! use systemd; then
sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
-i Makefile || die
fi
}
src_compile() {
emake GIT_COMMIT="${EGIT_COMMIT}" \
all
}
src_install() {
emake DESTDIR="${D}" \
PREFIX="/usr" \
install
dodir /usr/libexec/podman
ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
dodoc README.md
}

@ -1,5 +1,7 @@
AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
DIST podman-2.1.0.tar.gz 9444707 BLAKE2B 62dacd316a8d6ae8aab0523338d818c69cf1228120e828a89301c9fdbb98082b85328c03c61f9f2a36c7a50105ce5fd025ad2b0e9ba2705c86b0d7e263fc92a6 SHA512 eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e
DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367
EBUILD libpod-2.1.0.ebuild 4448 BLAKE2B 8fe2d70f01eb523fca83759bfe089736ee771dd9a40d0988a2635160b93e2358a713bf379c539152df4f8c8018c894f5e712d5d11214aad6ebfa815d02eaeee7 SHA512 7a646fb9ff678f49cd5ec0efd3cf2016f8e8a9c3cd467798cba9138e8f4669d2b1d49bf2fd9d6de855e88feb0599bccca2e30f5651dce6a25d350b092b01f57e
EBUILD libpod-2.2.1.ebuild 4448 BLAKE2B 8fe2d70f01eb523fca83759bfe089736ee771dd9a40d0988a2635160b93e2358a713bf379c539152df4f8c8018c894f5e712d5d11214aad6ebfa815d02eaeee7 SHA512 7a646fb9ff678f49cd5ec0efd3cf2016f8e8a9c3cd467798cba9138e8f4669d2b1d49bf2fd9d6de855e88feb0599bccca2e30f5651dce6a25d350b092b01f57e
MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646

@ -0,0 +1,154 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
inherit bash-completion-r1 flag-o-matic go-module
DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
HOMEPAGE="https://github.com/containers/podman/"
MY_PN=podman
MY_P=${MY_PN}-${PV}
SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="apparmor btrfs +fuse +rootless selinux"
RESTRICT="test"
COMMON_DEPEND="
app-crypt/gpgme:=
>=app-emulation/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
>=net-misc/cni-plugins-0.8.6
sys-fs/lvm2
sys-libs/libseccomp:=
apparmor? ( sys-libs/libapparmor )
btrfs? ( sys-fs/btrfs-progs )
rootless? ( app-emulation/slirp4netns )
selinux? ( sys-libs/libselinux:= )
"
DEPEND="
${COMMON_DEPEND}
dev-go/go-md2man"
RDEPEND="${COMMON_DEPEND}
fuse? ( sys-fs/fuse-overlayfs )"
S=${WORKDIR}/${MY_P}
src_prepare() {
default
# Disable installation of python modules here, since those are
# installed by separate ebuilds.
local makefile_sed_args=(
-e '/^GIT_.*/d'
-e 's/$(GO) build/$(GO) build -v -work -x/'
-e 's/^\(install:.*\) install\.python$/\1/'
-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
)
has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
sed "${makefile_sed_args[@]}" -i Makefile || die
sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-i hack/get_release_info.sh || die
}
src_compile() {
# Filter unsupported linker flags
filter-flags '-Wl,*'
[[ -f hack/apparmor_tag.sh ]] || die
if use apparmor; then
echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
else
echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
fi
[[ -f hack/btrfs_installed_tag.sh ]] || die
if use btrfs; then
echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
else
echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
hack/btrfs_installed_tag.sh || die
fi
[[ -f hack/selinux_tag.sh ]] || die
if use selinux; then
echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
else
echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
fi
# Avoid this error when generating pkg/varlink/iopodman.go:
# cannot find package "github.com/varlink/go/varlink/idl"
mkdir -p _output || die
ln -snf ../vendor _output/src || die
GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
rm _output/src || die
export -n GOCACHE GOPATH XDG_CACHE_HOME
GOBIN="${S}/bin" \
emake all \
GIT_BRANCH=master \
GIT_BRANCH_CLEAN=master \
COMMIT_NO="${EGIT_COMMIT}" \
GIT_COMMIT="${EGIT_COMMIT}"
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
insinto /etc/containers
newins test/registries.conf registries.conf.example
newins test/policy.json policy.json.example
insinto /usr/share/containers
doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
newinitd "${FILESDIR}"/podman.initd podman
insinto /etc/logrotate.d
newins "${FILESDIR}/podman.logrotated" podman
dobashcomp completions/bash/*
keepdir /var/lib/containers
}
pkg_preinst() {
LIBPOD_ROOTLESS_UPGRADE=false
if use rootless; then
has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
fi
}
pkg_postinst() {
local want_newline=false
if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
elog "You need to create the following config files:"
elog "/etc/containers/registries.conf"
elog "/etc/containers/policy.json"
elog "To copy over default examples, use:"
elog "cp /etc/containers/registries.conf{.example,}"
elog "cp /etc/containers/policy.json{.example,}"
want_newline=true
fi
if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
${want_newline} && elog ""
elog "For rootless operation, you need to configure subuid/subgid"
elog "for user running podman. In case subuid/subgid has only been"
elog "configured for root, run:"
elog "usermod --add-subuids 1065536-1131071 <user>"
elog "usermod --add-subgids 1065536-1131071 <user>"
want_newline=true
fi
}

@ -1,3 +1,5 @@
DIST slirp4netns-1.1.4.tar.gz 55346 BLAKE2B 86716ec9f42ae0087e9e7d142683f53b986275bce20b5ab0a33d0cdd63778adfeeadc86e5abb52d4a7e3e89baa0440c1a99bde920eeb2ed5293046e451d8ad01 SHA512 a6a26c55bdd4f50e668f7feeee3cd1d077e1ca9bd5bad5bbb8c47b15d366af4b1f2900241bedcd5a974a7597f43b17f970662271ec1987fbb6291c50470fa0a8
DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999ce5cb6bafc85f233d4d64a58c545ff7e9db21501f718ce7990d2497a6960853ecb9ff548859b1be19f3d74e86610b SHA512 28b2dd73cfd0a0fc71338c55a7f4ae448456620a0d27eb1e7c79f2d58da2a90f2f9af363c9abf5148d4d6435f69ea26809e5f20721fec5daf4c9897bb29c3547
EBUILD slirp4netns-1.1.4.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
MISC metadata.xml 459 BLAKE2B e33a3af85acb845c8dde439efb0cc6cc87f5fb04e17d67af393a06f8b4b44242c434f3fae231118d2233c45ad733dcbeed3ed273fd4f66ff70292c39e5ad11ef SHA512 012156833690e44656fae463045a5559e564959904436adcac0af92bae8867c71bb7c24fa0fc416da890b0bad4d53e29a9b6d354b81e673e16d8b1956e9a0d04

@ -0,0 +1,40 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
DESCRIPTION="User-mode networking for unprivileged network namespaces"
HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
LICENSE="GPL-2"
SLOT="0"
RDEPEND="
dev-libs/glib:2=
dev-libs/libpcre:=
net-libs/libslirp:=
sys-libs/libseccomp:=
sys-libs/libcap:="
DEPEND="${RDEPEND}
virtual/pkgconfig"
RESTRICT="test"
src_prepare() {
# Respect AR variable for bug 722162.
sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-i configure.ac || die
eautoreconf
default
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog "You need to have the tun kernel module loaded in order to have"
elog "slirp4netns working"
fi
}

Binary file not shown.

@ -1,7 +1,4 @@
DIST ibus-rime-1.2.tar.gz 33396 BLAKE2B 39930ea31d40e622cd69d6f5a218729f460161dd9681e49bc35a1eb9b3875b6f5acbdaf36f7cf8200440bc27ed84a2f23ec1578b19a1fe6abbbc54c7078be11c SHA512 e1851781a6d069a79d04890b5b0aa2a706e611c08df3fcb99f883eeedd4dc4eefcac207f35b5cf1d856a41f0153ec3fbb040b4e6f610727384baa19b52a64155
DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da061a3e8154232809ff29d766b630dcd06723bb0a8e18ebd089a640b7ab6787f8c70a6405dfa82472c1abfe5d4e SHA512 f0991184805bfe19931e297779179661f98bdfea952e310b2d8618550002cfa5bb08df05d1c5e31b535ad9959a919fdc98fa771a90d4d82b9c50e2f592cb7dfd
AUX ibus-rime-1.4.0-fno-common.patch 278 BLAKE2B b4ec86e71074309ccacec7299b5c6f5e9eda55af3b1a8e5a8db105833c5482fd10aacf22e03fd61bea75646930b3285c8a2a6b907f54223556cffd3884beebcc SHA512 45fd643cea9695b92eecc76e93a7908967b3eb66a108541ec6733c1a6e145ef43aa81592666db1d811b2460593ac3a0b1432990d387f58c897bfd1360f2a9b80
DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145
EBUILD ibus-rime-1.2.ebuild 759 BLAKE2B 270180498169d6f2a503dcebc3cf01b78bbdfae03a45dc8fa8cbdecbb999fb40b1d8c675c002a51e625fbeb277e9abcaffcb23ba6a8a5d0c05af46c54a21d37d SHA512 2a28941562893dd9827bd9621abc7d89ae51e50132671f8fd3fa5533df340b523a1964eeb1d71df6492c074f286a4337a2ab93863d9d303b82af62768ebcefb4
EBUILD ibus-rime-1.3.0.ebuild 759 BLAKE2B 44bd36ab9b90c93c4a7338f3921ca100c06506acd2ee65c434d26802882b41b66168910cf7ae4cdf8045bbf54222b7200314e488251156c4e8fbdd2b07e3a9fd SHA512 ee0fbc41180122bcb9aa0cb793cb248d0100f813b3bf63b4737e24fc760029299e9d701e08ed2d68cc27ecfb0286a4c76c93cbb42c9d84d21be7b7c9a3d6fffb
EBUILD ibus-rime-1.4.0.ebuild 761 BLAKE2B 346a2abea3aa85ea4c2f877f8321a61137106d2d2d4409d8fec47195d992afe838bb0e97a02d5ecac2ca173e880388f01c76ef0b4af4279552a4e25d6854cce2 SHA512 9bc441c6ef302907057cf44dd3f6ff1028a52e1804ab4be6258c30c54d382e6f904dd31193d2e7a6ee995047865ee9414e84a8286e76d7fad569db33965fb544
EBUILD ibus-rime-1.4.0.ebuild 807 BLAKE2B d4c5bb3ff31b04e07c072a1ff44b934d74d56b5dc39726d44dfec7390ae4213c0fc401c0223d4d3b139874d8e0436e01459db877024700871c2a66c817731cc8 SHA512 e1102beae2168d556f306e05b4960a4fd94eefc3978996ba6fdd06d0752268f67d0d006d53adc9e993914e70b97cac9e8c20e7c12ef339ab10155ffca77e657d
MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317

@ -0,0 +1,11 @@
--- a/rime_settings.h
+++ b/rime_settings.h
@@ -20,7 +20,7 @@ struct IBusRimeSettings {
struct ColorSchemeDefinition* color_scheme;
};
-struct IBusRimeSettings g_ibus_rime_settings;
+extern struct IBusRimeSettings g_ibus_rime_settings;
void
ibus_rime_load_settings();

@ -1,34 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Chinese Rime Input Method Engine for IBus"
HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
CDEPEND="app-i18n/ibus
app-i18n/librime
x11-libs/libnotify"
RDEPEND="${CDEPEND}
app-i18n/rime-data"
DEPEND="${CDEPEND}
dev-util/cmake
virtual/pkgconfig"
S="${WORKDIR}/${PN}"
src_prepare() {
sed -i \
-e "/^libexecdir/s:/lib:/libexec:" \
-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
-e "s/ make/ \$(MAKE)/" \
Makefile
sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
default
}

@ -1,33 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Chinese Rime Input Method Engine for IBus"
HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
CDEPEND="app-i18n/ibus
app-i18n/librime
x11-libs/libnotify"
RDEPEND="${CDEPEND}
app-i18n/rime-data"
DEPEND="${CDEPEND}
dev-util/cmake
virtual/pkgconfig"
src_prepare() {
sed -i \
-e "/^libexecdir/s:/lib:/libexec:" \
-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
-e "s/ make/ \$(MAKE)/" \
Makefile
sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
default
}

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -10,24 +10,25 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
CDEPEND="app-i18n/ibus
RDEPEND="
app-i18n/ibus
app-i18n/librime
app-i18n/rime-data
x11-libs/libnotify"
RDEPEND="${CDEPEND}
app-i18n/rime-data"
DEPEND="${CDEPEND}
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/cmake
virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
sed -i \
-e "/^libexecdir/s:/lib:/libexec:" \
-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
-e "s/ make/ \$(MAKE)/" \
Makefile
sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
-e "s/ make/ \$(MAKE)/" Makefile || die
sed -i -e "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml || die
default
}

@ -1,3 +1,4 @@
AUX imsettings-1.7.2-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
EBUILD imsettings-1.7.2.ebuild 1789 BLAKE2B 7227bf82d4af977b95dd3a60e55794a6b077fe6c9a86f764c81c92fbaf013289f8f34f20769cab33802373cc8bd7d5733797e502f6d909acd20990b11c0ffc60 SHA512 5f2b52791ef53c5d15f3bffcf199feaeb01fbb788ee8a1d3694b8e5f3225caf13d40262cf3c417c644b2a3e8c96fa2ac2670fa185fe0f37ebb0e131e0cf65e58
EBUILD imsettings-1.7.2.ebuild 1787 BLAKE2B a32a55cb94527a601c38b6f40ba47495cc48c385d793682b0d9174875ba9b73edf985ec627249d8ef36f1c62901583655452810e1e320b04eba307d174aee98f SHA512 4283751cff7ab98e639eed3d41d8c7bb9a341ea97c90fa45103242e728a5a5b8bfeac18c2b048e827b6dabbb1317ff148f50f3fab6bd40320b5f17bf71a42811
MISC metadata.xml 618 BLAKE2B c16dbfede5fb6a394335483488c6bc195020c4161278088f7f44d82506f5e4b6e8afac64747098b703200b83b6ee8d7f18b790b5b2cb79e71647e0e6025e8820 SHA512 029b4a98d5fb139a0f504161627461e227b58a712d578aeba4da9deb2c5ae04a78a83a1cf42c0966315d6c43db860f64ac7f6a38a22ae3e4d87b2960fde14301

@ -0,0 +1,11 @@
--- a/imsettings-daemon/imsettings-server.c
+++ b/imsettings-daemon/imsettings-server.c
@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = {
NULL,
NULL,
};
-guint signals[LAST_SIGNAL];
+extern guint signals[LAST_SIGNAL];
G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT);
G_LOCK_DEFINE_STATIC (logger);

@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
EAPI=7
inherit autotools xdg-utils
inherit autotools
DESCRIPTION="Delivery framework for general Input Method configuration"
HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~x86"
IUSE="gconf gtk2 qt5 +introspection static-libs xfconf"
IUSE="gconf gtk2 qt5 +introspection xfconf"
RESTRICT="test"
RDEPEND="dev-libs/glib:2
@ -26,7 +26,8 @@ RDEPEND="dev-libs/glib:2
!gtk2? ( x11-libs/gtk+:3 )
introspection? ( dev-libs/gobject-introspection )
xfconf? ( xfce-base/xfconf )"
DEPEND="${RDEPEND}
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
dev-util/intltool
sys-devel/autoconf-archive
@ -35,6 +36,8 @@ DEPEND="${RDEPEND}
MY_XINPUTSH="90-xinput"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
sed -i \
-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
@ -49,18 +52,17 @@ src_prepare() {
default
eautoreconf
xdg_environment_reset
}
src_configure() {
econf \
$(use_enable static-libs static) \
--disable-static \
--with-xinputsh=${MY_XINPUTSH}
}
src_install() {
default
find "${D}" -name '*.la' -delete || die
find "${ED}" -name '*.la' -delete || die
fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
}

Binary file not shown.

@ -1,6 +1,7 @@
AUX pommed-1.39-fno-common.patch 496 BLAKE2B 5eecd8303fcbddccd12c2dd4ae24f8e46dbba5d1788fccae2ca47b8d3a7a680092460ec6e25422ad0332d1ac7b6ad249fe9ac75f33b57d83d57fc94f1c609f5a SHA512 b61449c21e73f42ff1487d9fff662f959e0707bed79826733a6cd4327cc92151caf974dc46c787b91934776461d7f1af83b5fc9574f902d9e2839159bf6f56fb
AUX pommed-1.39.patch 3024 BLAKE2B 44ba221b8ba8e328ca322ecb9cf53dd8c10d9cfc82575d74d95cff929570086af0d4cb5d81532bf182f750615b59b05369ced1205cf8a7f0d6ca86a7606dcc21 SHA512 c048643afe0de01a161515963fc11fa330b39cd6304f139ab831032f51e2722d30c7e9b93e1de7d1150283bef570e44772e226f8c13e512d66b1ebe08a7892be
AUX pommed.rc 383 BLAKE2B 96e43ba7a0d6e78ced0546f2d947cd2e150629ce9a9260029e97267ecf2c0012b6427b92dd8a3edee57f790ace13dc0688131544a50f9e3d315d1b2918693fca SHA512 54c3ee9242ab68f7a162e5892f4b5ee1064328f4b23c9da05f75acdb5c8c93245533af1320b6fa20f026f62060b5a0558eab1215c9c8491086545b7733c6c87b
AUX pommed.service 155 BLAKE2B 5c99ee7f519f01c43a9cc4513b6a474aa5179482f48f687a796f5f8d49e71b3b67275de270decadfe1566a4b31f7f52ab59579e2d79e51de919064e6ec8c251d SHA512 00cfd3417ec09cef62e478ac7b5483b1857de2061106c8ae368dbaf0ff5c7b06e974ea85bba411601e76e5bbef53e4ab5b743aa7366c9d717d865a7fd3cd604d
DIST pommed-1.39.tar.gz 995020 BLAKE2B b96169b3fa3f3f8cd8ce122af07ba6e13f2bd0969cd6f3aff8b2755dd1295ec581746ac3a5f692710bf8ad25ec1ca76819dcaa2d26681f5299548eb9693334f3 SHA512 26568e359d8ef853710b1d86f397981e87245a84b2ff006964035ea8643e97df44fe52b01841d085eb8dd1aee586e1c8b60c44089f463e2a64b2b95c010a9d10
EBUILD pommed-1.39-r1.ebuild 2218 BLAKE2B 5dc81641c6cf4f3cc587094232f2b02d1405498810bb8bcb0756542399222a8fe39aa16a29c90e24c7a4deb10b2d88769bb57759f45e7a52953b14d0812c3e89 SHA512 1cda9305cb642b45e2b960fc1b911884c178ac955245577b8113bda822069682aa45d8c2c08a7b62c993f185fb4447df6de1d879dc67d881a04264a3bfe0fa0c
EBUILD pommed-1.39-r1.ebuild 2213 BLAKE2B 53f54e2565e8402bc7e04015473aad84626bb2ba8bf3b38c898f4291686758d23106466a2ea2412c7017c523634626e1777464f2c1ded1acbe7bf103fb9f992b SHA512 63648ba2b981ccf10954fe88bf26a917dda187c00b909830a96d29d7d8d9006dbc4a2febae9838597d53a040bb14aef51aa41417396e43a868b24f340c2386fa
MISC metadata.xml 644 BLAKE2B e8639125013d5f7024f9e49cbfef306ead9a8c7c3486fe2538a79de4394d01e122c5b6af241b98405491299d00a48fd683fb94fd4795294ea5f96ba56b434784 SHA512 3e31c0588847153aa548d8b09eb5a896f372f6c2c70deb5ac5efbd0f6401877fcf38fb8d04d5cfc718ec228157da86229eefb8101be5bdca0c6e5e540e48aa01

@ -0,0 +1,22 @@
--- a/pommed/mactel/nv8600mgt_backlight.c
+++ b/pommed/mactel/nv8600mgt_backlight.c
@@ -48,7 +48,7 @@
#include "../dbus.h"
-struct _lcd_bck_info lcd_bck_info;
+extern struct _lcd_bck_info lcd_bck_info;
static int nv8600mgt_inited = 0;
--- a/pommed/mactel/x1600_backlight.c
+++ b/pommed/mactel/x1600_backlight.c
@@ -45,7 +45,7 @@
#include "../dbus.h"
-struct _lcd_bck_info lcd_bck_info;
+extern struct _lcd_bck_info lcd_bck_info;
static int fd = -1;
static char *memory = NULL;

@ -1,8 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils toolchain-funcs linux-info systemd
EAPI=7
inherit desktop linux-info systemd
DESCRIPTION="Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook"
HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
@ -14,23 +15,30 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="gtk X"
COMMON_DEPEND="media-libs/alsa-lib
x86? ( sys-apps/pciutils )
amd64? ( sys-apps/pciutils )
DEPEND="
media-libs/alsa-lib
media-libs/audiofile
dev-libs/confuse
>=sys-apps/dbus-1.1
dev-libs/dbus-glib
sys-apps/dbus
sys-libs/zlib
media-libs/audiofile
amd64? ( sys-apps/pciutils )
x86? ( sys-apps/pciutils )
gtk? ( x11-libs/gtk+:2 )
X? ( x11-libs/libX11
X? (
x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
RDEPEND="${COMMON_DEPEND}
x11-libs/libXpm
)"
RDEPEND="${DEPEND}
media-sound/alsa-utils
virtual/eject"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}.patch
"${FILESDIR}"/${P}-fno-common.patch
)
pkg_setup() {
if ! use ppc; then
@ -41,16 +49,12 @@ pkg_setup() {
fi
}
src_prepare() {
epatch "${FILESDIR}/${P}.patch"
}
src_compile() {
cd "${S}"/pommed
cd "${S}"/pommed || die
emake CC="$(tc-getCC)" OFLIB=1
if use gtk; then
cd "${S}"/gpomme
cd "${S}"/gpomme || die
local POFILES=""
for LANG in ${LINGUAS}; do
if [ -f po/${LANG}.po ]; then
@ -60,7 +64,7 @@ src_compile() {
emake CC="$(tc-getCC)" POFILES="${POFILES}"
fi
if use X; then
cd "${S}"/wmpomme
cd "${S}"/wmpomme || die
emake CC="$(tc-getCC)"
fi
}

Binary file not shown.

@ -1,3 +1,3 @@
DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
EBUILD lfm-3.1.ebuild 451 BLAKE2B 4fcb8ad9bede7c22cda471cb1bc8395f9981ad279c380f2af4bcff746e50bcbfca260435719e1a218d9d23ec856233423b72ee5ba2c35e1cfcd0c3fa7cc7a509 SHA512 471f3479ba96298df8ad8c8ca8f06aefa4000ea28d23bece7f9d9440a176d4eb4df66e6a47cf38695d5e254239a8316eca853f0bc00d23171a3742e0e8479817
EBUILD lfm-3.1.ebuild 450 BLAKE2B 99c077e2d7cf21c45e2ac1149434e32a9ec0464cfb22f31e4a362fe16bd2043d4c56d3c2df81654aa969cd3cf0b6944bf074c5f0026481a8491f9628219ef852 SHA512 c959191b3712c57cecda9b446cc8556e872ebe45e38bb6a71ecf09a3b9e48cf1f91d58e91361e31a1df0382449bf2edf22e7958900ac035beea9b7cc124dcdae
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784

@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="ncurses"
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1

@ -1,3 +1,5 @@
AUX utimer-0.4-fno-common.patch 672 BLAKE2B 2a325b112f2be43780e5e60a134c305859055b5e1c0af11e4d2ebc856d97fb550835f99ea67ca118022a52ecee65ca190c567cf0bd8faf719c0e319007b71a1b SHA512 a52e79c326022d893692d6b79b5240a758186172608373c099d18a60b65d3d50343071c6936647c8be58c7959a959704aeee08e87cc5da8708b0735640a18374
AUX utimer-0.4-locale.patch 188 BLAKE2B 57e8f72c6541e1b161186ee4043c4685bb9593cd257bac5c11d7b80beeac627e434c60ee434036af5154636af7fbcb763a1d7d20da5e0226f193d488372b8845 SHA512 8c5d8c614def996e147dc89acad2e5a844413a5e16845bf76dd44761a3a2ac510b148eb72db0ab2e34d4d4d7097c60f3dc245b0ac4f99cf22eb700791d4f69bd
DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
EBUILD utimer-0.4-r1.ebuild 665 BLAKE2B 6e2bfbf7a9d0f1aab60a8d5b69d1ea3727729a8b26c8e36f951da2315c86f890db1d3318f8369d1fd7b270c5911985da1c4acf24769025b83c6ba67701c1f786 SHA512 3a03b5be2a019b9319e16f903da9bafccb920a4d9cf8ad4a7ca9396d79adbba9fee1801c0abfcaf11389c8bb17b9d2e6500bd652c98e15e6c680b4d9529e3a23
EBUILD utimer-0.4-r1.ebuild 613 BLAKE2B cd8164d4e0d22b5317fa0eaca07d2f330a4bba770bf7819c50d5916a8410e6352f763cf180c7f7b14fc13cee0c2a4815b9c14bb511372b1468649cba945e22a4 SHA512 9ba26c95372b88ffd991f11c829f0915a290cbb4f2b83f0dbb62eb0741a94325188d4bafb2c6cea77b149a70d2be365bf2ec7a851124a977eb681b5134f57072
MISC metadata.xml 349 BLAKE2B 7c7669d3a1a33cea3684b7fe7d3cac9f45cb0c93c71a28314084c1b6a418774003afadfd7b8f204db91509c188fb46d6a43271ffc745d3bb933221cd4bf519c9 SHA512 36bc7a82cebaf4a6915d78a65a3d69f845b139a699bc9a6b1d0137749bd0e210d6973cdecb8d68d50363f60baa5ed14af59b53d1414149c1115261d94910acd4

@ -0,0 +1,29 @@
--- a/src/utimer.h
+++ b/src/utimer.h
@@ -66,9 +66,9 @@
#define TIMER_PRINT_RATE_MSEC 79
#define TIMER_CHECK_RATE_MSEC 500
-GMainLoop *loop;
-gboolean paused;
-struct termios savedttystate;
-Config ut_config;
+extern GMainLoop *loop;
+extern gboolean paused;
+extern struct termios savedttystate;
+extern Config ut_config;
#endif /* UTIMER_H */
--- a/src/utils.c
+++ b/src/utils.c
@@ -36,6 +36,10 @@
#include "utils.h"
#include "utimer.h"
+GMainLoop *loop;
+gboolean paused;
+struct termios savedttystate;
+Config ut_config;
gulong ul_add (gulong a, gulong b)
{

@ -0,0 +1,10 @@
--- a/src/utimer.h
+++ b/src/utimer.h
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <glib.h>
#include <glib/gi18n-lib.h>
+#include <locale.h>
#include "utils.h"
#include "timer.h"

@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
DESCRIPTION="A command line timer and stopwatch"
HOMEPAGE="http://utimer.codealpha.net/utimer"
@ -12,21 +12,19 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug nls"
DEPEND="
RDEPEND="
dev-libs/glib:2
dev-util/intltool"
DEPEND="${RDEPEND}"
RDEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-fno-common.patch
"${FILESDIR}"/${P}-locale.patch
)
DOCS=( AUTHORS ChangeLog NEWS README )
src_configure() {
local myconf=( --enable-debug=no )
use debug || myconf=( --enable-debug=yes )
econf "${myconf[@]}" $(use_enable nls)
}
src_install() {
emake install DESTDIR="${D}"
einstalldocs
econf \
$(use_enable debug) \
$(use_enable nls)
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save