diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-26 16:46:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-26 16:46:16 +0000 |
| commit | 1ed51e52d4abc06590c6fdae2c71047e23c1e69e (patch) | |
| tree | 68474cf4d3967d0d5af09f1864ef6d8c4c7f775b /net-misc/ntp | |
| parent | mips stable (diff) | |
| download | gentoo-2-1ed51e52d4abc06590c6fdae2c71047e23c1e69e.tar.gz gentoo-2-1ed51e52d4abc06590c6fdae2c71047e23c1e69e.tar.bz2 gentoo-2-1ed51e52d4abc06590c6fdae2c71047e23c1e69e.zip | |
old
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'net-misc/ntp')
34 files changed, 0 insertions, 2577 deletions
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 23b39ed6a524..7b0ff684d160 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,74 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 4.1.2-droproot.patch 12672 RMD160 977c39c8e5c512efd6e172cb823fd24dcb80735e SHA1 d6706c35ca038663466acd9d31c49ecede96fae1 SHA256 0eceaf7e95787704577f056113eecfaa5579b1821c3cf043ab0d16d19be45b69 -MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672 -RMD160 977c39c8e5c512efd6e172cb823fd24dcb80735e files/4.1.2-droproot.patch 12672 -SHA256 0eceaf7e95787704577f056113eecfaa5579b1821c3cf043ab0d16d19be45b69 files/4.1.2-droproot.patch 12672 -AUX 4.2.0-droproot.patch 13908 RMD160 f3c2a83c1ca6f6fc792af8d7196a15c88e39c9db SHA1 802449908681dd725e51c2cf16faaa0c37d0a94a SHA256 4f78d08b79c11780ea61f830fbed6bb9633638f0fcceb3212191b7b747cbcfc4 -MD5 0ac690ae52fe02f336ae73f9857461ec files/4.2.0-droproot.patch 13908 -RMD160 f3c2a83c1ca6f6fc792af8d7196a15c88e39c9db files/4.2.0-droproot.patch 13908 -SHA256 4f78d08b79c11780ea61f830fbed6bb9633638f0fcceb3212191b7b747cbcfc4 files/4.2.0-droproot.patch 13908 -AUX 4.2.0-linux-config-phone.patch 711 RMD160 f22b8e49b2410888029fee4afefe1fd9c6bb36b4 SHA1 d30cb785c90c8b2d2f30c1b0a5b9c774c2677fb3 SHA256 d016e0317c699d253b4363c8e3141c832d18ee5a4a39d9c42ece1dd1aeb1d8da -MD5 24574e6ad1b468152839c10361b51a0f files/4.2.0-linux-config-phone.patch 711 -RMD160 f22b8e49b2410888029fee4afefe1fd9c6bb36b4 files/4.2.0-linux-config-phone.patch 711 -SHA256 d016e0317c699d253b4363c8e3141c832d18ee5a4a39d9c42ece1dd1aeb1d8da files/4.2.0-linux-config-phone.patch 711 -AUX 4.2.0-ntpdate-quiet.patch 1117 RMD160 e95757fa954743f5d646a060546c6478aace4022 SHA1 2b9c04502eeaea271adf7db6afc69d57c9b5d413 SHA256 eb6fe3c4e0e540d7a8d825d9c4ccaa5bbcdfc0a7290081fdd282bc027ebdd65b -MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117 -RMD160 e95757fa954743f5d646a060546c6478aace4022 files/4.2.0-ntpdate-quiet.patch 1117 -SHA256 eb6fe3c4e0e540d7a8d825d9c4ccaa5bbcdfc0a7290081fdd282bc027ebdd65b files/4.2.0-ntpdate-quiet.patch 1117 -AUX 4.2.0.20040617-debug-fix.patch 232 RMD160 bcc03f65d29759e6352cafbfeaef654a50e02abd SHA1 3b1ec14499054e28359adadcd25c75ef307a787e SHA256 4bf413c3bc7636a85f0e0b0439fb08a3763202b6fc6444e916bb4661ddc7661d -MD5 5fecd7747324b76551f514df62a4d78d files/4.2.0.20040617-debug-fix.patch 232 -RMD160 bcc03f65d29759e6352cafbfeaef654a50e02abd files/4.2.0.20040617-debug-fix.patch 232 -SHA256 4bf413c3bc7636a85f0e0b0439fb08a3763202b6fc6444e916bb4661ddc7661d files/4.2.0.20040617-debug-fix.patch 232 -AUX 4.2.0.20040617-errno-fix.patch 493 RMD160 b880dc7613ed9aae821ef34e2da908c5359e73e7 SHA1 e5ad1184213676b072783dcd0ecd535c39f8c089 SHA256 782ee7709d6070a5a0037c156982fbd9694994115fee4e17819e759954ca97b6 -MD5 759c1adb57e9c61f519fe938902f1df7 files/4.2.0.20040617-errno-fix.patch 493 -RMD160 b880dc7613ed9aae821ef34e2da908c5359e73e7 files/4.2.0.20040617-errno-fix.patch 493 -SHA256 782ee7709d6070a5a0037c156982fbd9694994115fee4e17819e759954ca97b6 files/4.2.0.20040617-errno-fix.patch 493 -AUX 4.2.0.20040617-freebsd.patch 803 RMD160 99e3d0e402bb190f3d680298284a0dc5d4504b91 SHA1 9df105c301dcc7d08cf3b4fdfcc01b491b246ef1 SHA256 7d428bbf907c69add2985e7ebc7a5a29a62885f1c049eaa10b907f9565d1a54c -MD5 2bc77f5ebab9804cdc2dff52ab4c267a files/4.2.0.20040617-freebsd.patch 803 -RMD160 99e3d0e402bb190f3d680298284a0dc5d4504b91 files/4.2.0.20040617-freebsd.patch 803 -SHA256 7d428bbf907c69add2985e7ebc7a5a29a62885f1c049eaa10b907f9565d1a54c files/4.2.0.20040617-freebsd.patch 803 -AUX 4.2.0.20040617-hostname.patch 8476 RMD160 38e8bdf86bfca4060c6264d615e794c032f385ed SHA1 329d79b3aad95e7d102d5071d05902a280384bcd SHA256 e369f5a40f9e5556be84b1aea233a669c638369b82758a7b81c2b1c8b024e1de -MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476 -RMD160 38e8bdf86bfca4060c6264d615e794c032f385ed files/4.2.0.20040617-hostname.patch 8476 -SHA256 e369f5a40f9e5556be84b1aea233a669c638369b82758a7b81c2b1c8b024e1de files/4.2.0.20040617-hostname.patch 8476 -AUX 4.2.0.20040617-ipv6-fixes.patch 2541 RMD160 fe521781725e906190b5695062f14bcabfbf0057 SHA1 7aaf6d7ade411f5eacbe887a9be1746ff7ddde82 SHA256 6d251450cbd542be9ea1d6e9c467a87952b10b2b74eb7e95c9418f1b534e7e58 -MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541 -RMD160 fe521781725e906190b5695062f14bcabfbf0057 files/4.2.0.20040617-ipv6-fixes.patch 2541 -SHA256 6d251450cbd542be9ea1d6e9c467a87952b10b2b74eb7e95c9418f1b534e7e58 files/4.2.0.20040617-ipv6-fixes.patch 2541 -AUX broadcastclient.patch 451 RMD160 2ae505a30ac2a52db6f4576a8f015357483340c5 SHA1 06cff0d72653eb85e7b43d166e2b3b905d9f1282 SHA256 889ec86ecf95636fa519c684045284c286d405fbf719221966abfe4cea1ef540 -MD5 4e13c1a5fa0fa54e3b65ec311dd7270a files/broadcastclient.patch 451 -RMD160 2ae505a30ac2a52db6f4576a8f015357483340c5 files/broadcastclient.patch 451 -SHA256 889ec86ecf95636fa519c684045284c286d405fbf719221966abfe4cea1ef540 files/broadcastclient.patch 451 -AUX linux-config-phone.patch 747 RMD160 a69da0921c9383930e3a80c6b0dcf3a45c662741 SHA1 3795d92fbe5ae764dbc1ff63434c7eaa7ee02724 SHA256 9038e9a38c11e085cbb1faf990ea572aa611e84084780083956cce47d3bdfb7c -MD5 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747 -RMD160 a69da0921c9383930e3a80c6b0dcf3a45c662741 files/linux-config-phone.patch 747 -SHA256 9038e9a38c11e085cbb1faf990ea572aa611e84084780083956cce47d3bdfb7c files/linux-config-phone.patch 747 -AUX ntp-4.1.1b-syscall-libc.patch 424 RMD160 6e11795d3e8b901806ac374fbd9b9f50cceac5c3 SHA1 c4250a1b478366adee57914d8ae4528976d8fe60 SHA256 6070eb72188d7ab47581c6f809c5dfd465e186e68f00ae2917be87035070397a -MD5 e327d521e4dfb0c967941eeb84ad9207 files/ntp-4.1.1b-syscall-libc.patch 424 -RMD160 6e11795d3e8b901806ac374fbd9b9f50cceac5c3 files/ntp-4.1.1b-syscall-libc.patch 424 -SHA256 6070eb72188d7ab47581c6f809c5dfd465e186e68f00ae2917be87035070397a files/ntp-4.1.1b-syscall-libc.patch 424 -AUX ntp-4.2.0-gcc4.patch 1607 RMD160 96b31674fb7a0b3acd317f07b9107e696a7bfbf5 SHA1 a42d9667334a8b1c7de78566597821f90d2213b3 SHA256 eed14b74714345d088739afad80775b37b8fb0603e73a782fdf8f41e6330ff12 -MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607 -RMD160 96b31674fb7a0b3acd317f07b9107e696a7bfbf5 files/ntp-4.2.0-gcc4.patch 1607 -SHA256 eed14b74714345d088739afad80775b37b8fb0603e73a782fdf8f41e6330ff12 files/ntp-4.2.0-gcc4.patch 1607 -AUX ntp-4.2.0-ntpd-using-wrong-group.patch 338 RMD160 7cc64378211687d932baa3e3b04fb69bbad1c717 SHA1 fe36fa52ce76531d46c0017fe5a351f9ba86a283 SHA256 fdd3b51ec6b591690168df1ae59f622cf5d9dd54085e29f0e55e901786c52083 -MD5 621c8a8e9589eb73a7f51095d8fca090 files/ntp-4.2.0-ntpd-using-wrong-group.patch 338 -RMD160 7cc64378211687d932baa3e3b04fb69bbad1c717 files/ntp-4.2.0-ntpd-using-wrong-group.patch 338 -SHA256 fdd3b51ec6b591690168df1ae59f622cf5d9dd54085e29f0e55e901786c52083 files/ntp-4.2.0-ntpd-using-wrong-group.patch 338 -AUX ntp-4.2.0.20050303-rlimit-memlock.patch 839 RMD160 771d40a38f1ae33cdee53c9ece0ede6be5d68f61 SHA1 ac40d1125cc9c1678c2c82a124705c9553c61a97 SHA256 fc5072cf0ac04b95c3b242e6de489779abf564b260fbea48da016b12f2330ce3 -MD5 339d87d68d483b28f5b70dd76cbc20c4 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839 -RMD160 771d40a38f1ae33cdee53c9ece0ede6be5d68f61 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839 -SHA256 fc5072cf0ac04b95c3b242e6de489779abf564b260fbea48da016b12f2330ce3 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839 -AUX ntp-4.2.2_p2-sntp-header.patch 239 RMD160 ef54dbe18e39ccfdc642f97ed03c26a8dd337002 SHA1 0573c0111df19d073f8dc7e5f2b954f17d0050e1 SHA256 3ccbbac286bd214d91ad5939d94e4d2b107cf954cc319997d31951fb2c523fc8 -MD5 6fff5d2793b5cd469e275757e33f5665 files/ntp-4.2.2_p2-sntp-header.patch 239 -RMD160 ef54dbe18e39ccfdc642f97ed03c26a8dd337002 files/ntp-4.2.2_p2-sntp-header.patch 239 -SHA256 3ccbbac286bd214d91ad5939d94e4d2b107cf954cc319997d31951fb2c523fc8 files/ntp-4.2.2_p2-sntp-header.patch 239 -AUX ntp-client-4.1.2.rc 840 RMD160 c59a65945c2b82159a5fb3daf0d0dc2ac2962945 SHA1 97d88ba47005a35bc54d00fc39f1b06eea651379 SHA256 fd49a2ced29d224ae1d802ffc2cdf65dc735c4c6562d646af74e8031aa215f99 -MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840 -RMD160 c59a65945c2b82159a5fb3daf0d0dc2ac2962945 files/ntp-client-4.1.2.rc 840 -SHA256 fd49a2ced29d224ae1d802ffc2cdf65dc735c4c6562d646af74e8031aa215f99 files/ntp-client-4.1.2.rc 840 AUX ntp-client.confd 747 RMD160 06c8312f745b6d532d41cb9f2319ef91c7d26c4a SHA1 5b1bf1d65683b66c284bee25e14b7f66fe21ec46 SHA256 fe0277d2b38cc52c2336b20fb46a62c20e2a273f025bbad6348a393aac4bb3ee MD5 47d7106c23cb6ac99c5bbfdcd2f3a7fa files/ntp-client.confd 747 RMD160 06c8312f745b6d532d41cb9f2319ef91c7d26c4a files/ntp-client.confd 747 @@ -85,14 +14,6 @@ AUX ntp.logrotate 50 RMD160 26e70f82cdc0c346bfb7458cdc09461d6da061ec SHA1 79c509 MD5 19b878e23991b3aa64868b35670385b7 files/ntp.logrotate 50 RMD160 26e70f82cdc0c346bfb7458cdc09461d6da061ec files/ntp.logrotate 50 SHA256 2f0c759ec8659090f1996572dc5e78cb930b12b7aec8570d446dddd6f2fab599 files/ntp.logrotate 50 -AUX ntpd-4.1.2.confd 185 RMD160 2e52155242679a232797583620f7b3d6a3336234 SHA1 0e00fc3ca0f88b554f41376630cc9ae206642493 SHA256 130cfd7d1b7aa2af65122a4fc21a3baf12f04e483d742e546dc9a9c1a27c8c1f -MD5 4d502821fd36c5a63b14ae4b54cb3526 files/ntpd-4.1.2.confd 185 -RMD160 2e52155242679a232797583620f7b3d6a3336234 files/ntpd-4.1.2.confd 185 -SHA256 130cfd7d1b7aa2af65122a4fc21a3baf12f04e483d742e546dc9a9c1a27c8c1f files/ntpd-4.1.2.confd 185 -AUX ntpd-4.1.2.rc 806 RMD160 42085c3790d10393401eedb49483a30f7e9f5d05 SHA1 430df8a11d7af6c37bb050c9b1b9825abb6c6b21 SHA256 b9f3763f5795b1f24efcda96fa2d7afe966b4a6888db7d61cb3e7f693e9c224e -MD5 87951141777f50b2e4a2347a96f987b8 files/ntpd-4.1.2.rc 806 -RMD160 42085c3790d10393401eedb49483a30f7e9f5d05 files/ntpd-4.1.2.rc 806 -SHA256 b9f3763f5795b1f24efcda96fa2d7afe966b4a6888db7d61cb3e7f693e9c224e files/ntpd-4.1.2.rc 806 AUX ntpd.confd 189 RMD160 f66902d8abf5180ac8cc24646d665597cec8ba43 SHA1 f5fc6088e5f859f59b8a7a085da2193154a2c222 SHA256 a3bc17ee0f7d41102d6c33e4281e22d312a42cc2ffd8848b08e9cd78d63f2d05 MD5 5e1591f145a63cf66ee20ab65495781a files/ntpd.confd 189 RMD160 f66902d8abf5180ac8cc24646d665597cec8ba43 files/ntpd.confd 189 @@ -101,50 +22,8 @@ AUX ntpd.rc 805 RMD160 5b8ab5a48bca9bdc8052d07092ecdda1a21f9c5b SHA1 1708ff0dbd6 MD5 299ea30653b1e0b93d51f19e07176bc4 files/ntpd.rc 805 RMD160 5b8ab5a48bca9bdc8052d07092ecdda1a21f9c5b files/ntpd.rc 805 SHA256 26fe2367fc969cc0f7dc150d7ec218fef1e316eb0d72715e6f59344fe154673e files/ntpd.rc 805 -DIST ntp-4.1.2-manpages.tbz2 19961 RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd5c SHA1 6df4e6e7ba61f6c26a7ae01a3581fbd5df3f3fed SHA256 2b1174f9158c1af00bfbda451719321cea2f8b98d68d0b54e2f087d347195835 -DIST ntp-4.1.2.tar.gz 2168384 RMD160 053bc86725a923784da6af37f6a844f6a9819d03 SHA1 2fc41170cd821365ffaa112a5e9b871fda042c81 SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a -DIST ntp-4.2.0-r2-manpages.tar.bz2 25355 RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 SHA1 c4aae8d44f6a978a4746e263dad4c688b37f74d5 SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3 -DIST ntp-4.2.0.tar.gz 2514502 RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 SHA1 38343a4ebfc0b8d9aff3bec4c6a93f4c59071ce3 SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25 -DIST ntp-4.2.2-manpages.tar.bz2 25213 RMD160 ac90f9b371fe6cd6bfdf931fd53432e054e7ce8a SHA1 0484c00eab29456e148136999bcfc51bd6a17ec3 SHA256 290e5a2ccb61960c7c35b07ac5255c8efa0721858fd85594792b62daa2852bc0 -DIST ntp-4.2.2.tar.gz 2546027 RMD160 2cf9540cf2e6c5fc3e3d8922676ea3b2efb9215e SHA1 a3e9652a1d9e288e2c0d88d1876de67ca4d608fb SHA256 fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc -DIST ntp-4.2.2p2-manpages.tar.bz2 48744 RMD160 e684f7e0fc285b0cd469346859e9daf8ead413fc SHA1 da341206d762fe5797df1a82382ae4027445873e SHA256 1ca88851575e7cb2fc9c48409e26da89048ac78e4098f5a4f6d504846de28690 -DIST ntp-4.2.2p2.tar.gz 2563137 RMD160 3c4c01c902be0afe92dd15d52c746549bd26d27f SHA1 f43125e25138c7d4de1d054b4e6df8186ca30b8d SHA256 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923 DIST ntp-4.2.2p3-manpages.tar.bz2 48839 RMD160 ef4a57738db9978ba55d287795d866dad305bc38 SHA1 93a37e902fb1c1407dc72cfc3a0b319ecaa2f09d SHA256 c079192a64923de60d46a06f6e9c13aa6bd16f332deb287899e5f4286239ab90 DIST ntp-4.2.2p3.tar.gz 2563397 RMD160 fb377b5e7a561bca172e9ba71288a691c5f40f5e SHA1 3cbeea0c65e5346661301832c0484dfbf7395714 SHA256 385a606007eb14f5847f033ac6fa8ea48366597ad1f93aa99864e1f82e23ac88 -DIST ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 SHA1 1f6c4398938a562213b63f61ae232b0a3e2087c8 SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf -DIST ntp-stable-4.2.0a-20040617.tar.gz 2435648 RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 SHA1 99d20e4884acf63d8423625dd2c68655af6d16df SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3 -DIST ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 SHA1 036220c904de96cdd94aefe1b56ee832758a17dc SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d -DIST ntp-stable-4.2.0a-20050303.tar.gz 2446073 RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d SHA1 7a3a489fa2300a4074a11bc69be8bd6ad8b6979a SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c -DIST ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab SHA1 66be0f8d630a83838ee5de700f188d5abb731362 SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b -DIST ntp-stable-4.2.0a-20060224.tar.gz 2447194 RMD160 36bcce870220fb670d63c4b05a968075f990ca9c SHA1 73139f5aa6af1199ed172196d4cf7d1b35f09592 SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1 -EBUILD ntp-4.1.2.ebuild 3162 RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 SHA1 52918eb755155cb92a8398756cc7378697cb6ee3 SHA256 5ecd462cd07be1f01087116067196b26ff08a07d89265b5cd980102ec423c89a -MD5 4874c08acda470ce7373d36b64c39c09 ntp-4.1.2.ebuild 3162 -RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 ntp-4.1.2.ebuild 3162 -SHA256 5ecd462cd07be1f01087116067196b26ff08a07d89265b5cd980102ec423c89a ntp-4.1.2.ebuild 3162 -EBUILD ntp-4.2.0-r2.ebuild 3786 RMD160 fd0ef218dc3643397896d7153e8ebc1c9116d0c4 SHA1 5b4da5daa6d79f354d03845fa2594df9be7e5f04 SHA256 79556be03dcd57cd4708e6557543bdd820a42fccd9ab5f8a0c342ede485a7200 -MD5 657f7ff7af41c7b7bca9195bce453f35 ntp-4.2.0-r2.ebuild 3786 -RMD160 fd0ef218dc3643397896d7153e8ebc1c9116d0c4 ntp-4.2.0-r2.ebuild 3786 -SHA256 79556be03dcd57cd4708e6557543bdd820a42fccd9ab5f8a0c342ede485a7200 ntp-4.2.0-r2.ebuild 3786 -EBUILD ntp-4.2.0.20040617-r3.ebuild 4327 RMD160 1cb3213629f0c3e4839bb4b22833588224872767 SHA1 d0f8255f982c7361858a6f4e287cd4193dc6b781 SHA256 b4e377d309c7312bfbf3c04ac53a6aa1edd443549065db14a1106dcc00c64fc8 -MD5 8c95e743f03b3ab53542fdaa2a9cc73c ntp-4.2.0.20040617-r3.ebuild 4327 -RMD160 1cb3213629f0c3e4839bb4b22833588224872767 ntp-4.2.0.20040617-r3.ebuild 4327 -SHA256 b4e377d309c7312bfbf3c04ac53a6aa1edd443549065db14a1106dcc00c64fc8 ntp-4.2.0.20040617-r3.ebuild 4327 -EBUILD ntp-4.2.0.20050303-r1.ebuild 4373 RMD160 25fb0c3d60c5a4f5bbceebf4cbfda3ffe56516ed SHA1 73605d9e0d2518e94d019f971830dc50458cf985 SHA256 e07c5b7e3df3a95866a274f2bba46e89e39573ec122bff23d61d4f4e8e1f56ff -MD5 9ce4cd70ceb2a2a7f4a3540f38b44aeb ntp-4.2.0.20050303-r1.ebuild 4373 -RMD160 25fb0c3d60c5a4f5bbceebf4cbfda3ffe56516ed ntp-4.2.0.20050303-r1.ebuild 4373 -SHA256 e07c5b7e3df3a95866a274f2bba46e89e39573ec122bff23d61d4f4e8e1f56ff ntp-4.2.0.20050303-r1.ebuild 4373 -EBUILD ntp-4.2.0.20060224.ebuild 4247 RMD160 15d445da0a9b705eca73f119d46bbb03da3e25c7 SHA1 4b4cf4cd620b3ada642aed3e1d0a1a645c957ae3 SHA256 d7196d44a028b56f816f7a6836d9bd63dc8453390da2966b530538f8c9ed2f87 -MD5 27fe812cdc2b5d9fae3cdb05b5611776 ntp-4.2.0.20060224.ebuild 4247 -RMD160 15d445da0a9b705eca73f119d46bbb03da3e25c7 ntp-4.2.0.20060224.ebuild 4247 -SHA256 d7196d44a028b56f816f7a6836d9bd63dc8453390da2966b530538f8c9ed2f87 ntp-4.2.0.20060224.ebuild 4247 -EBUILD ntp-4.2.2.ebuild 3861 RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee SHA1 afdcc0e4a4d8fb27639b8342481dcca3d0ac9f1d SHA256 cbd3dcf3be18a5c1db493ec3955c33d241af15aa850d9fe73911df4356c5b10c -MD5 cb235e49c06ff3b3aff0e76d2cf52bc4 ntp-4.2.2.ebuild 3861 -RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee ntp-4.2.2.ebuild 3861 -SHA256 cbd3dcf3be18a5c1db493ec3955c33d241af15aa850d9fe73911df4356c5b10c ntp-4.2.2.ebuild 3861 -EBUILD ntp-4.2.2_p2.ebuild 3982 RMD160 0f5db51411279764c0ffdd95edfad7b79b818dc9 SHA1 a6f94a4f024a87904ee0ddf93cea086434331932 SHA256 e005e961744f4b0665d90363497b8e436f1fa3346b092651311623b416282a59 -MD5 91deb8a87c5c9cb733f48d78a9274753 ntp-4.2.2_p2.ebuild 3982 -RMD160 0f5db51411279764c0ffdd95edfad7b79b818dc9 ntp-4.2.2_p2.ebuild 3982 -SHA256 e005e961744f4b0665d90363497b8e436f1fa3346b092651311623b416282a59 ntp-4.2.2_p2.ebuild 3982 EBUILD ntp-4.2.2_p3.ebuild 3980 RMD160 29271aac352a5d157c39ea0bff5740675679b835 SHA1 e81b380e18a36db9c5b03ce1343c19fc77740acd SHA256 ae54177b55198eb038d09b963565af64f4837534de4fe872ba31d3c04928f3cf MD5 f985e0fb34f84737f7c8456226f8001a ntp-4.2.2_p3.ebuild 3980 RMD160 29271aac352a5d157c39ea0bff5740675679b835 ntp-4.2.2_p3.ebuild 3980 @@ -157,34 +36,6 @@ MISC metadata.xml 607 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 SHA1 67aab MD5 8d52071ded7c5d37f4823ac9a4fffb8e metadata.xml 607 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 metadata.xml 607 SHA256 14dc7da8f6d0ccaafa8408e289acd1a23f7adff23ef45c2fdd0d8b89d97d0222 metadata.xml 607 -MD5 2576cf7ebc8f987c9fa5c1273515bffb files/digest-ntp-4.1.2 479 -RMD160 21d74c0e0e0695ecd1f77ed63313dc1cf7e2f017 files/digest-ntp-4.1.2 479 -SHA256 18b1f0de391cea06ce03c29a12e20b8c11c0e9fc107809fc588ff752a6159e9e files/digest-ntp-4.1.2 479 -MD5 1f634215e1222f4f766c45d601ac7323 files/digest-ntp-4.2.0-r2 497 -RMD160 42cdba181c323221c990038b78748739a263036a files/digest-ntp-4.2.0-r2 497 -SHA256 fc6fd8fccc9b3ff1014caa573261f2ac9895be5e670e756f79460d3107dd5c23 files/digest-ntp-4.2.0-r2 497 -MD5 f2589822a0ac19bc03dcf2f6cad25cb9 files/digest-ntp-4.2.0.20040617-r3 590 -RMD160 0bb67bb35caf7d7d7d326954e1291121c2358266 files/digest-ntp-4.2.0.20040617-r3 590 -SHA256 4f6b718d85730a56536eed1ad22b6e2f8bff360e8ae318ee7ffd829eb06300c2 files/digest-ntp-4.2.0.20040617-r3 590 -MD5 ed77edec76176933f5c18a0270a778cd files/digest-ntp-4.2.0.20050303-r1 590 -RMD160 8392c0cc962cee77e66648bb74228d47c652e815 files/digest-ntp-4.2.0.20050303-r1 590 -SHA256 9d9a3df7128d19da2c75ddf21a4f3c358f89f6aa05b1c240b71e587b84e522b7 files/digest-ntp-4.2.0.20050303-r1 590 -MD5 16dafdee10ec932156fab9503b29ea97 files/digest-ntp-4.2.0.20060224 590 -RMD160 3439ae701cf97db73d599b430ff2a2f42feab1ec files/digest-ntp-4.2.0.20060224 590 -SHA256 4932ba26b477696bcd9f8ae11f9055de029b45e522ad685f82abd56ef67b22b7 files/digest-ntp-4.2.0.20060224 590 -MD5 3262184e8d74a645d0a9533c7fff7fa4 files/digest-ntp-4.2.2 488 -RMD160 7626c88be4d9cf362921b01ad3d75da3d21dc845 files/digest-ntp-4.2.2 488 -SHA256 49c96c94188f4ce54072347cd086e2acf60aa39d4ff81fce95c685a726744eca files/digest-ntp-4.2.2 488 -MD5 931e77d23c1e3b08a64d33bcae4ffad0 files/digest-ntp-4.2.2_p2 500 -RMD160 97521f75396a8e083da6976773b7cb33cf5aa939 files/digest-ntp-4.2.2_p2 500 -SHA256 489fe8b95da6a304f6da89b5f4a39445a7c32d5afb6afe29b17164373d41fb4e files/digest-ntp-4.2.2_p2 500 MD5 f6077d70e67af23af7319e71ed94cf8a files/digest-ntp-4.2.2_p3 500 RMD160 40cc7ef3b95bb7f7c2ac5448100abf644be8487b files/digest-ntp-4.2.2_p3 500 SHA256 560137fe3eb14759fad10b8b4c6af6e785a4de18be8103add02244e587d41f55 files/digest-ntp-4.2.2_p3 500 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFacQqamhnQswr0vIRAr/gAKCQ3UV6sUcFqBq2w8F31dzsKuX/cwCfdNqK -K8qMb0o0Adj4/IyPxZ0vJp0= -=LIQr ------END PGP SIGNATURE----- diff --git a/net-misc/ntp/files/4.1.2-droproot.patch b/net-misc/ntp/files/4.1.2-droproot.patch deleted file mode 100644 index 73cc21afff52..000000000000 --- a/net-misc/ntp/files/4.1.2-droproot.patch +++ /dev/null @@ -1,476 +0,0 @@ -Originally from ftp://ftp.redhat.com/pub/redhat/linux/7.2/en/os/i386/SRPMS/ntp-4.1.0-4.src.rpm -See <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=35653> for details. ---- ntp-4.0.99m-rc2/html/ntpd.htm.droproot Thu May 24 08:04:57 2001 -+++ ntp-4.0.99m-rc2/html/ntpd.htm Thu Aug 30 12:29:04 2001 -@@ -22,7 +22,7 @@ - driftfile</i> ] [ -g ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] - [ -N high ] [ -p <i>pidfile</i> ] [ -r <i>broadcastdelay</i> ] [ -s - <i>statsdir</i> ] [ -t <i>key</i> ] [ -v <i>variable</i> ] [ -V <i> --variable</i> ] [ -x ]</tt> -+variable</i> ] [ -T <i>chroot_dir</i> ] [ -U <i>server_user</i> ] [ -x ]</tt> - - <h4>Description</h4> - -@@ -379,6 +379,19 @@ - - <dd>Add a system variable listed by default.</dd> - -+ -+<DT><TT>-T <I>chroot_dir</I></TT></DT> -+<DD>Chroot the ntpd server process into <I>chroot_dir</I>. To use this -+option you have to copy all the files that ntpd process needs into the -+chroot directory. This option adds security only if the server also drops -+root privileges (see -U option).</DD> -+ -+<DT><TT>-U <I>server_user</I></TT></DT> -+<DD>Ntpd process drops root privileges and changes user ID to -+<I>server_user</I> and group ID to the primary group of <I>server_user</I>. -+To use this option you need libcap-library. -+</DD> -+ - <dt><tt>-x</tt></dt> - - <dd>Normally, the time is slewed if the offset is less than the ---- ntp-4.0.99m-rc2/html/ntpdate.htm.droproot Tue Apr 3 05:43:05 2001 -+++ ntp-4.0.99m-rc2/html/ntpdate.htm Thu Aug 30 12:29:04 2001 -@@ -26,6 +26,7 @@ - - <tt>ntpdate [ -bBdoqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] - [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -+-U <i>user_name</i> ] [ - -t <i>timeout</i> ] <i>server</i> [ ... ]</tt> - - <h4>Description</h4> -@@ -161,6 +162,12 @@ - - <dd>Be verbose. This option will cause <tt>ntpdate</tt>'s version - identification string to be logged.</dd> -+ -+<dt><tt>-U <i>user_name</i></tt></dt> -+ -+<dd>ntpdate process drops root privileges and changes user ID to -+<i>user_name</i> and group ID to the primary group of <i>server_user</i>. -+To use this option you need libcap-library.</dd> - </dl> - - <h4>Files</h4> ---- ntp-4.1.2/ntpd/Makefile.am.orig 2003-08-06 02:12:03.000000000 -0400 -+++ ntp-4.1.2/ntpd/Makefile.am 2003-08-06 02:12:10.000000000 -0400 -@@ -9,7 +9,7 @@ - # sqrt ntp_control.o - # floor refclock_wwv.o - # which are (usually) provided by -lm. --ntpd_LDADD = $(LDADD) -lm -+ntpd_LDADD = $(LDADD) -lm -lcap - DISTCLEANFILES = .version version.c - #EXTRA_DIST = ntpd.mak - ETAGS_ARGS = Makefile.am ---- ntp-4.0.99m-rc2/ntpd/ntpd.c.droproot Sat Apr 21 09:23:40 2001 -+++ ntp-4.0.99m-rc2/ntpd/ntpd.c Thu Aug 30 12:32:54 2001 -@@ -6,6 +6,11 @@ - # include <config.h> - #endif - -+#include <sys/capability.h> -+#include <sys/prctl.h> -+#include <pwd.h> -+#include <grp.h> -+ - #include "ntp_machine.h" - #include "ntpd.h" - #include "ntp_io.h" -@@ -96,6 +101,11 @@ - #include "ntp_crypto.h" - #endif /* PUBKEY */ - -+/* Username to run as */ -+char *server_user=0; -+/* Chroot to this dir */ -+char *chroot_dir=0; -+ - /* - * Signals we catch for debugging. If not debugging we ignore them. - */ -@@ -188,10 +198,60 @@ - char *argv[] - ) - { -+ server_user = NULL; -+ chroot_dir = NULL; - return ntpdmain(argc, argv); - } - #endif - -+/* This patch is adapted (copied) from Chris Wings drop root patch -+ * for xntpd. -+ */ -+void drop_root(uid_t server_uid, gid_t server_gid) -+{ -+ cap_t caps; -+ -+ if (prctl(PR_SET_KEEPCAPS, 1)) { -+ msyslog(LOG_ERR, "prctl(PR_SET_KEEPCAPS, 1) failed"); -+ exit(1); -+ } -+ -+ if ( setgroups(0, NULL) == -1 ) { -+ msyslog(LOG_ERR, "setgroups failed."); -+ exit(1); -+ } -+ -+ if ( setegid(server_gid) == -1 || seteuid(server_uid) == -1 ) { -+ msyslog(LOG_ERR, "setegid/seteuid to uid=%d/gid=%d failed.", server_uid, -+ server_gid); -+ exit(1); -+ } -+ -+ caps = cap_from_text("cap_sys_time=epi"); -+ if (caps == NULL) { -+ msyslog(LOG_ERR, "cap_from_text failed."); -+ exit(1); -+ } -+ -+ if (cap_set_proc(caps) == -1) { -+ msyslog(LOG_ERR, "cap_set_proc failed."); -+ exit(1); -+ } -+ -+ /* Try to free the memory from cap_from_text */ -+ cap_free( caps ); -+ -+ if ( setregid(server_gid, server_gid) == -1 || -+ setreuid(server_uid, server_uid) == -1 ) { -+ msyslog(LOG_ERR, "setregid/setreuid to uid=%d/gid=%d failed.", server_uid, -+ server_gid); -+ exit(1); -+ } -+ -+ msyslog(LOG_DEBUG, "running as uid(%d)/gid(%d) euid(%d)/egid(%d).", -+ getuid(), getgid(), geteuid(), getegid()); -+} -+ - #ifdef _AIX - /* - * OK. AIX is different than solaris in how it implements plock(). -@@ -337,6 +397,9 @@ - #ifdef _AIX /* HMS: ifdef SIGDANGER? */ - struct sigaction sa; - #endif -+ struct passwd *pwd = NULL; -+ uid_t server_uid; -+ gid_t server_gid; - - initializing = 1; /* mark that we are initializing */ - debug = 0; /* no debugging by default */ -@@ -377,6 +440,29 @@ - #endif - getstartup(argc, argv); /* startup configuration, may set debug */ - -+ /* Lookup server_user uid/gid before chroot/chdir */ -+ if ( server_user ) { -+ pwd = getpwnam( server_user ); -+ if ( pwd == NULL ) { -+ msyslog(LOG_ERR, "Failed to lookup user '%s'.", server_user); -+ exit(1); -+ } -+ server_uid = pwd->pw_uid; -+ server_gid = pwd->pw_gid; -+ } -+ -+ /* Try to chroot to chroot_dir. This probably makes sense only if -+ * the server drops root privileges. -+ */ -+ if ( chroot_dir ) { -+ if ( chroot(chroot_dir) == -1 || chdir("/") == -1 ) { -+ msyslog(LOG_ERR, "chroot/chdir to '%s' failed.", chroot_dir); -+ exit(1); -+ } -+ /* Close /dev/log */ -+ closelog(); -+ } -+ - /* - * Initialize random generator and public key pair - */ -@@ -745,6 +831,10 @@ - #endif /* AUTOKEY */ - initializing = 0; - -+ if ( server_user ) { -+ drop_root( server_uid, server_gid ); -+ } -+ - #if defined(SYS_WINNT) && !defined(NODETACH) - # if defined(DEBUG) - if(!debug) ---- ntp-4.0.99m-rc2/ntpd/cmd_args.c.droproot Fri Apr 20 00:50:01 2001 -+++ ntp-4.0.99m-rc2/ntpd/cmd_args.c Thu Aug 30 12:34:33 2001 -@@ -15,7 +15,15 @@ - extern char const *progname; - int listen_to_virtual_ips = 0; - -+static const char *ntp_options = "aAbc:dD:f:gk:l:LmnN:p:P:qr:s:t:v:V:x-:U:T:"; -+ -+/* Drop root patch */ -+extern char *server_user; -+extern char *chroot_dir; -+ -+/* - static const char *ntp_options = "aAbc:dD:f:gk:l:LmnN:p:P:qr:s:t:v:V:x-:"; -+*/ - - #ifdef HAVE_NETINFO - extern int check_netinfo; -@@ -114,7 +122,31 @@ - ++errflg; - break; - -- default: -+ case 'U': -+ if ( !ntp_optarg ) { -+ fprintf(stderr, "Error: Need username with 'U' option\n"); -+ exit(1); -+ } -+ else { -+ if ( !server_user ) { -+ server_user = strdup(ntp_optarg); -+ } -+ } -+ break; -+ -+ case 'T': -+ if ( !ntp_optarg ) { -+ fprintf(stderr, "Error: Need directory with 'T' option\n"); -+ exit(1); -+ } -+ else { -+ if ( !chroot_dir ) { -+ chroot_dir = strdup(ntp_optarg); -+ } -+ } -+ break; -+ -+ default: - break; - } - -@@ -123,6 +155,7 @@ - (void) fprintf(stderr, "\t\t[ -f freq_file ] [ -k key_file ] [ -l log_file ]\n"); - (void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broad_delay ] [ -s statdir ]\n"); - (void) fprintf(stderr, "\t\t[ -t trust_key ] [ -v sys_var ] [ -V default_sysvar ]\n"); -+ (void) fprintf(stderr, "\t\t[ -T chroot_dir ] [ -U server_user ]\n"); - #if defined(HAVE_SCHED_SETSCHEDULER) - (void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n"); - #endif -@@ -293,6 +326,10 @@ - allow_step = FALSE; - break; - -+ case 'U': /* already done at pre-scan */ -+ case 'T': /* already done at pre-scan */ -+ break; -+ - default: - errflg++; - break; -@@ -304,6 +341,7 @@ - (void) fprintf(stderr, "\t\t[ -f freq_file ] [ -k key_file ] [ -l log_file ]\n"); - (void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broad_delay ] [ -s statdir ]\n"); - (void) fprintf(stderr, "\t\t[ -t trust_key ] [ -v sys_var ] [ -V default_sysvar ]\n"); -+ (void) fprintf(stderr, "\t\t[ -T chroot_dir ] [ -U server_user ]\n"); - #if defined(HAVE_SCHED_SETSCHEDULER) - (void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n"); - #endif ---- ntp-4.1.2/ntpdate/Makefile.am.orig 2003-08-06 02:12:54.000000000 -0400 -+++ ntp-4.1.2/ntpdate/Makefile.am 2003-08-06 02:13:59.000000000 -0400 -@@ -5,6 +5,7 @@ - INCLUDES = -I$(top_srcdir)/include - # LDADD might need RESLIB and ADJLIB - LDADD = version.o ../libntp/libntp.a @LIBRSAREF@ -+ntpdate_LDADD = $(LDADD) -lcap - DISTCLEANFILES = .version version.c stamp-v - noinst_HEADERS = ntpdate.h - #EXTRA_DIST = ntpdate.mak ---- ntp-4.0.99m-rc2/ntpdate/ntpdate.c.droproot Sun Apr 22 11:42:48 2001 -+++ ntp-4.0.99m-rc2/ntpdate/ntpdate.c Thu Aug 30 12:29:04 2001 -@@ -41,6 +41,12 @@ - # include <sys/resource.h> - #endif /* HAVE_SYS_RESOURCE_H */ - -+/* Linux capabilities */ -+#include <sys/capability.h> -+#include <sys/prctl.h> -+#include <pwd.h> -+#include <grp.h> -+ - #ifdef SYS_VXWORKS - # include "ioLib.h" - # include "sockLib.h" -@@ -127,6 +133,11 @@ - int rate = 0; - - /* -+ * Use capabilities to drop privileges and switch uids -+ */ -+char *server_user; -+ -+/* - * Program name. - */ - char *progname; -@@ -273,6 +284,88 @@ - static ni_namelist *getnetinfoservers P((void)); - #endif - -+/* This patch is adapted (copied) from Chris Wings drop root patch -+ * for xntpd. -+ */ -+void drop_root(uid_t server_uid, gid_t server_gid) -+{ -+ cap_t caps; -+ -+ if (prctl(PR_SET_KEEPCAPS, 1)) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "prctl(PR_SET_KEEPCAPS, 1) failed"); -+ } -+ else { -+ fprintf(stderr, "prctl(PR_SET_KEEPCAPS, 1) failed.\n"); -+ } -+ exit(1); -+ } -+ -+ if ( setgroups(0, NULL) == -1 ) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "setgroups failed."); -+ } -+ else { -+ fprintf(stderr, "setgroups failed.\n"); -+ } -+ exit(1); -+ } -+ -+ if ( setegid(server_gid) == -1 || seteuid(server_uid) == -1 ) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "setegid/seteuid to uid=%d/gid=%d failed.", server_uid, -+ server_gid); -+ } -+ else { -+ fprintf(stderr, "setegid/seteuid to uid=%d/gid=%d failed.\n", server_uid, -+ server_gid); -+ } -+ exit(1); -+ } -+ -+ caps = cap_from_text("cap_sys_time=epi"); -+ if (caps == NULL) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "cap_from_text failed."); -+ } -+ else { -+ fprintf(stderr, "cap_from_text failed.\n"); -+ } -+ exit(1); -+ } -+ -+ if (cap_set_proc(caps) == -1) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "cap_set_proc failed."); -+ } -+ else { -+ fprintf(stderr, "cap_set_proc failed.\n"); -+ } -+ exit(1); -+ } -+ -+ /* Try to free the memory from cap_from_text */ -+ cap_free( caps ); -+ -+ if ( setregid(server_gid, server_gid) == -1 || -+ setreuid(server_uid, server_uid) == -1 ) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "setregid/setreuid to uid=%d/gid=%d failed.", -+ server_uid, server_gid); -+ } -+ else { -+ fprintf(stderr, "setregid/setreuid to uid=%d/gid=%d failed.\n", -+ server_uid, server_gid); -+ } -+ exit(1); -+ } -+ -+ if (syslogit) { -+ msyslog(LOG_DEBUG, "running as uid(%d)/gid(%d) euid(%d)/egid(%d).", -+ getuid(), getgid(), geteuid(), getegid()); -+ } -+} -+ - /* - * Main program. Initialize us and loop waiting for I/O and/or - * timer expiries. -@@ -323,7 +416,7 @@ - #ifdef NO_MAIN_ALLOWED - clear_globals(); - #endif -- -+ server_user = NULL; - errflg = 0; - progname = argv[0]; - syslogit = 0; -@@ -331,7 +424,7 @@ - /* - * Decode argument list - */ -- while ((c = ntp_getopt(argc, argv, "a:bBde:k:o:p:qr:st:uv")) != EOF) -+ while ((c = ntp_getopt(argc, argv, "a:bBde:k:o:p:qr:st:uvU:")) != EOF) - switch (c) - { - case 'a': -@@ -417,13 +510,22 @@ - case '?': - ++errflg; - break; -+ case 'U': -+ if (ntp_optarg) { -+ server_user = strdup(ntp_optarg); -+ } -+ else { -+ ++errflg; -+ } -+ break; -+ - default: - break; - } - - if (errflg) { - (void) fprintf(stderr, -- "usage: %s [-bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n", -+ "usage: %s [-bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] [-U username] server ...\n", - progname); - exit(2); - } -@@ -536,6 +638,24 @@ - initializing = 0; - - was_alarmed = 0; -+ -+ if (server_user) { -+ struct passwd *pwd = NULL; -+ -+ /* Lookup server_user uid/gid before chroot/chdir */ -+ pwd = getpwnam( server_user ); -+ if ( pwd == NULL ) { -+ if (syslogit) { -+ msyslog(LOG_ERR, "Failed to lookup user '%s'.", server_user); -+ } -+ else { -+ fprintf(stderr, "Failed to lookup user '%s'.\n", server_user); -+ } -+ exit(1); -+ } -+ drop_root(pwd->pw_uid, pwd->pw_gid); -+ } -+ - rbuflist = (struct recvbuf *)0; - while (complete_servers < sys_numservers) { - #ifdef HAVE_POLL_H diff --git a/net-misc/ntp/files/4.2.0-droproot.patch b/net-misc/ntp/files/4.2.0-droproot.patch deleted file mode 100644 index 6a06271c9c96..000000000000 --- a/net-misc/ntp/files/4.2.0-droproot.patch +++ /dev/null @@ -1,363 +0,0 @@ -diff -u -r ntp-4.2.0/config.h.in ntp-4.2.0-droproot/config.h.in ---- ntp-4.2.0/config.h.in 2003-10-15 11:02:22.000000000 +0200 -+++ ntp-4.2.0-droproot/config.h.in 2003-12-03 13:06:36.000000000 +0100 -@@ -300,8 +300,11 @@ - /* Do we have the CIOGETEV ioctl (SunOS, Linux)? */ - #undef HAVE_CIOGETEV - --/* [Use], [/dev/clockctl?] */ --#undef HAVE_CLOCKCTL -+/* Do we have clock control without full root privileges? */ -+#undef HAVE_DROPROOT -+ -+/* Do we get clock access via Linux capabilities? */ -+#undef HAVE_LINUX_CAPABILITIES - - /* Define to 1 if you have the `clock_gettime' function. */ - #undef HAVE_CLOCK_GETTIME -diff -u -r ntp-4.2.0/configure.in ntp-4.2.0-droproot/configure.in ---- ntp-4.2.0/configure.in 2003-10-15 10:52:44.000000000 +0200 -+++ ntp-4.2.0-droproot/configure.in 2003-12-03 13:09:27.000000000 +0100 -@@ -48,7 +48,7 @@ - - AC_CACHE_CHECK(if we should use /dev/clockctl, ac_clockctl, - [AC_ARG_ENABLE(clockctl, -- AC_HELP_STRING([--enable-clockctl], [Use /dev/clockctl for non-root time control]), -+ AC_HELP_STRING([--enable-clockctl], [Use /dev/clockctl for non-root clock control]), - [ans=$enableval], - [case "$target" in - *-*-netbsd*) -@@ -63,10 +63,28 @@ - AC_CHECK_HEADERS(sys/clockctl.h) - case "$ac_clockctl$ac_cv_header_sys_clockctl_h" in - yesyes) -- AC_DEFINE(HAVE_CLOCKCTL, ,[[Use /dev/clockctl?]]) -+ AC_DEFINE(HAVE_DROPROOT, ,[Can we drop root privileges?]) - ;; - esac - -+AC_CACHE_CHECK(if we have linux capabilities (libcap), ac_linuxcaps, -+[AC_ARG_ENABLE(linuxcaps, -+ AC_HELP_STRING([--enable-linuxcaps], [Use Linux capabilities for non-root clock control]), -+ [ans=$enableval], -+ [ans=no]) -+ac_linuxcaps=$ans]) -+# End of AC_CACHE_CHECK for linuxcaps -+AC_CHECK_HEADERS(sys/capability.h) -+AC_CHECK_HEADERS(sys/prctl.h) -+case "$ac_linuxcaps$ac_cv_header_sys_capability_h$ac_cv_header_sys_prctl_h" in -+ yesyesyes) -+ AC_DEFINE(HAVE_LINUX_CAPABILITIES, ,[Do we have Linux capabilities?]) -+ AC_DEFINE(HAVE_DROPROOT, ,[Can we drop root privileges?]) -+ LIBS="$LIBS -lcap" -+ ;; -+esac -+ -+ - case "$build" in - $host) - ;; -diff -u -r ntp-4.2.0/html/ntpd.html ntp-4.2.0-droproot/html/ntpd.html ---- ntp-4.2.0/html/ntpd.html 2003-10-13 10:13:31.000000000 +0200 -+++ ntp-4.2.0-droproot/html/ntpd.html 2003-12-03 13:07:34.000000000 +0100 -@@ -33,7 +33,7 @@ - </ul> - <hr> - <h4 id="synop">Synopsis</h4> -- <tt>ntpd [ -46aAbdDgLmnNPqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt> -+ <tt>ntpd [ -46aAbdDgLmnNPqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt> - <h4 id="descr">Description</h4> - <p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p> - <h4 id="op">How NTP Operates</h4> -@@ -84,6 +84,8 @@ - <dd>Specify the name and path of the frequency file, default <tt>/etc/ntp.drift</tt>. This is the same operation as the <tt>driftfile <i>driftfile</i></tt> configuration command. - <dt><tt>-g</tt> - <dd>Normally, <tt>ntpd</tt> exits with a message to the system log if the offset exceeds the panic threshold, which is 1000 s by default. This option allows the time to be set to any value without restriction; however, this can happen only once. If the threshold is exceeded after that, <tt>ntpd</tt> will exit with a message to the system log. This option can be used with the <tt>-q</tt> and <tt>-x</tt> options. See the <tt>tinker</tt> command for other options. -+ <dt><tt>-i <i>jaildir</i></tt> -+ <dd>Chroot the server to the directory <i>jaildir</i>. This option also implies that the server attempts to drop root privileges at startup (otherwise, chroot gives very little additional security), and it is only available if the OS supports to run the server without full root privileges. You may need to also specify a <tt>-u</tt> option. - <dt><tt>-k <i>keyfile</i></tt> - <dd>Specify the name and path of the symmetric key file, default <tt>/etc/ntp.keys</tt>. This is the same operation as the <tt>keys <i>keyfile</i></tt> configuration command. - <dt><tt>-l <i>logfile</i></tt> -@@ -108,6 +110,8 @@ - <dd>Specify the directory path for files created by the statistics facility. This is the same operation as the <tt>statsdir <i>statsdir</i></tt> configuration command. - <dt><tt>-t <i>key</i></tt> - <dd>Add a key number to the trusted key list. This option can occur more than once. -+ <dt><tt>-u <i>user[:group]</i> </tt> -+ <dd>Specify a user, and optionally a group, to switch to. This option is only available if the OS supports to run the server without full root privileges. Currently, this option is supported under NetBSD (configure with --enable-clockctl) and Linux (configure with --enable-linuxcaps). - <dt><tt>-v <i>variable</i></tt> - <dt><tt>-V <i>variable</i></tt> - <dd>Add a system variable listed by default. -diff -u -r ntp-4.2.0/include/ntpd.h ntp-4.2.0-droproot/include/ntpd.h ---- ntp-4.2.0/include/ntpd.h 2003-09-13 05:08:04.000000000 +0200 -+++ ntp-4.2.0-droproot/include/ntpd.h 2003-12-03 13:06:36.000000000 +0100 -@@ -420,7 +420,8 @@ - extern volatile int debug; /* debugging flag */ - extern int nofork; /* no-fork flag */ - extern int initializing; /* initializing flag */ --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT -+extern int droproot; /* flag: try to drop root privileges after startup */ - extern char *user; /* user to switch to */ - extern char *group; /* group to switch to */ - extern char *chrootdir; /* directory to chroot to */ -diff -u -r ntp-4.2.0/ntpd/cmd_args.c ntp-4.2.0-droproot/ntpd/cmd_args.c ---- ntp-4.2.0/ntpd/cmd_args.c 2003-07-17 12:27:25.000000000 +0200 -+++ ntp-4.2.0-droproot/ntpd/cmd_args.c 2003-12-03 13:06:36.000000000 +0100 -@@ -161,7 +161,7 @@ - #if defined(HAVE_SCHED_SETSCHEDULER) - (void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n"); - #endif --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT - (void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i chrootdir ]\n"); - #endif - exit(2); -@@ -254,7 +254,8 @@ - break; - - case 'i': --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT -+ droproot = 1; - if (!ntp_optarg) - errflg++; - else -@@ -317,14 +318,21 @@ - break; - - case 'u': --#ifdef HAVE_CLOCKCTL -- user = malloc(strlen(ntp_optarg) + 1); -- if ((user == NULL) || (ntp_optarg == NULL)) -+#ifdef HAVE_DROPROOT -+ droproot = 1; -+ if( ! ntp_optarg ) { - errflg++; -- (void)strncpy(user, ntp_optarg, strlen(ntp_optarg) + 1); -- group = rindex(user, ':'); -- if (group) -- *group++ = '\0'; /* get rid of the ':' */ -+ } else { -+ user = malloc(strlen(ntp_optarg) + 1); -+ if (user == NULL) { -+ errflg++; -+ } else { -+ (void)strncpy(user, ntp_optarg, strlen(ntp_optarg) + 1); -+ group = rindex(user, ':'); -+ if (group) -+ *group++ = '\0'; /* get rid of the ':' */ -+ } -+ } - #else - errflg++; - #endif -@@ -409,7 +417,7 @@ - #if defined(HAVE_SCHED_SETSCHEDULER) - (void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n"); - #endif --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT - (void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i chrootdir ]\n"); - #endif - exit(2); -diff -u -r ntp-4.2.0/ntpd/ntpd.c ntp-4.2.0-droproot/ntpd/ntpd.c ---- ntp-4.2.0/ntpd/ntpd.c 2003-07-17 12:27:28.000000000 +0200 -+++ ntp-4.2.0-droproot/ntpd/ntpd.c 2003-12-03 13:06:36.000000000 +0100 -@@ -104,10 +104,14 @@ - # include <sys/ci/ciioctl.h> - #endif - --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT - # include <ctype.h> - # include <grp.h> - # include <pwd.h> -+#ifdef HAVE_LINUX_CAPABILITIES -+# include <sys/capability.h> -+# include <sys/prctl.h> -+#endif - #endif - - /* -@@ -164,7 +168,8 @@ - */ - int nofork; - --#ifdef HAVE_CLOCKCTL -+#ifdef HAVE_DROPROOT -+int droproot = 0; - char *user = NULL; /* User to switch to */ - char *group = NULL; /* group to switch to */ - char *chrootdir = NULL; /* directory to chroot to */ -@@ -173,7 +178,7 @@ - char *endp; - struct group *gr; - struct passwd *pw; --#endif /* HAVE_CLOCKCTL */ -+#endif /* HAVE_DROPROOT */ - - /* - * Initializing flag. All async routines watch this and only do their -@@ -834,64 +839,106 @@ - # endif - #endif - --#ifdef HAVE_CLOCKCTL -- /* -- * Drop super-user privileges and chroot now if the OS supports -- * non root clock control (only NetBSD for now). -- */ -- if (user != NULL) { -- if (isdigit((unsigned char)*user)) { -- sw_uid = (uid_t)strtoul(user, &endp, 0); -- if (*endp != '\0') -- goto getuser; -- } else { -+#ifdef HAVE_DROPROOT -+ if( droproot ) { -+ /* Drop super-user privileges and chroot now if the OS supports this */ -+ -+#ifdef HAVE_LINUX_CAPABILITIES -+ /* set flag: keep privileges accross setuid() call (we only really need cap_sys_time): */ -+ if( prctl( PR_SET_KEEPCAPS, 1L, 0L, 0L, 0L ) == -1 ) { -+ msyslog( LOG_ERR, "prctl( PR_SET_KEEPCAPS, 1L ) failed: %m" ); -+ exit(-1); -+ } -+#else -+ /* we need a user to switch to */ -+ if( user == NULL ) { -+ msyslog(LOG_ERR, "Need user name to drop root privileges (see -u flag!)" ); -+ exit(-1); -+ } -+#endif /* HAVE_LINUX_CAPABILITIES */ -+ -+ if (user != NULL) { -+ if (isdigit((unsigned char)*user)) { -+ sw_uid = (uid_t)strtoul(user, &endp, 0); -+ if (*endp != '\0') -+ goto getuser; -+ } else { - getuser: -- if ((pw = getpwnam(user)) != NULL) { -- sw_uid = pw->pw_uid; -- } else { -- errno = 0; -- msyslog(LOG_ERR, "Cannot find user `%s'", user); -- exit (-1); -- } -- } -- } -- if (group != NULL) { -- if (isdigit((unsigned char)*group)) { -- sw_gid = (gid_t)strtoul(group, &endp, 0); -- if (*endp != '\0') -- goto getgroup; -- } else { -+ if ((pw = getpwnam(user)) != NULL) { -+ sw_uid = pw->pw_uid; -+ } else { -+ errno = 0; -+ msyslog(LOG_ERR, "Cannot find user `%s'", user); -+ exit (-1); -+ } -+ } -+ } -+ if (group != NULL) { -+ if (isdigit((unsigned char)*group)) { -+ sw_gid = (gid_t)strtoul(group, &endp, 0); -+ if (*endp != '\0') -+ goto getgroup; -+ } else { - getgroup: -- if ((gr = getgrnam(group)) != NULL) { -- sw_gid = pw->pw_gid; -- } else { -- errno = 0; -- msyslog(LOG_ERR, "Cannot find group `%s'", group); -- exit (-1); -- } -- } -- } -- if (chrootdir && chroot(chrootdir)) { -- msyslog(LOG_ERR, "Cannot chroot to `%s': %m", chrootdir); -- exit (-1); -- } -- if (group && setgid(sw_gid)) { -- msyslog(LOG_ERR, "Cannot setgid() to group `%s': %m", group); -- exit (-1); -- } -- if (group && setegid(sw_gid)) { -- msyslog(LOG_ERR, "Cannot setegid() to group `%s': %m", group); -- exit (-1); -- } -- if (user && setuid(sw_uid)) { -- msyslog(LOG_ERR, "Cannot setuid() to user `%s': %m", user); -- exit (-1); -- } -- if (user && seteuid(sw_uid)) { -- msyslog(LOG_ERR, "Cannot seteuid() to user `%s': %m", user); -- exit (-1); -- } --#endif -+ if ((gr = getgrnam(group)) != NULL) { -+ sw_gid = pw->pw_gid; -+ } else { -+ errno = 0; -+ msyslog(LOG_ERR, "Cannot find group `%s'", group); -+ exit (-1); -+ } -+ } -+ } -+ -+ if( chrootdir ) { -+ /* make sure cwd is inside the jail: */ -+ if( chdir(chrootdir) ) { -+ msyslog(LOG_ERR, "Cannot chdir() to `%s': %m", chrootdir); -+ exit (-1); -+ } -+ if( chroot(chrootdir) ) { -+ msyslog(LOG_ERR, "Cannot chroot() to `%s': %m", chrootdir); -+ exit (-1); -+ } -+ } -+ if (group && setgid(sw_gid)) { -+ msyslog(LOG_ERR, "Cannot setgid() to group `%s': %m", group); -+ exit (-1); -+ } -+ if (group && setegid(sw_gid)) { -+ msyslog(LOG_ERR, "Cannot setegid() to group `%s': %m", group); -+ exit (-1); -+ } -+ if (user && setuid(sw_uid)) { -+ msyslog(LOG_ERR, "Cannot setuid() to user `%s': %m", user); -+ exit (-1); -+ } -+ if (user && seteuid(sw_uid)) { -+ msyslog(LOG_ERR, "Cannot seteuid() to user `%s': %m", user); -+ exit (-1); -+ } -+ -+#ifdef HAVE_LINUX_CAPABILITIES -+ do { -+ /* We may be running under non-root uid now, but we still hold full root privileges! -+ * We drop all of them, except for the crucial one: cap_sys_time: -+ */ -+ cap_t caps; -+ if( ! ( caps = cap_from_text( "cap_sys_time=ipe" ) ) ) { -+ msyslog( LOG_ERR, "cap_from_text() failed: %m" ); -+ exit(-1); -+ } -+ if( cap_set_proc( caps ) == -1 ) { -+ msyslog( LOG_ERR, "cap_set_proc() failed to drop root privileges: %m" ); -+ exit(-1); -+ } -+ cap_free( caps ); -+ } while(0); -+#endif /* HAVE_LINUX_CAPABILITIES */ -+ -+ } /* if( droproot ) */ -+#endif /* HAVE_DROPROOT */ -+ - /* - * Report that we're up to any trappers - */ diff --git a/net-misc/ntp/files/4.2.0-linux-config-phone.patch b/net-misc/ntp/files/4.2.0-linux-config-phone.patch deleted file mode 100644 index 669a4f1a7630..000000000000 --- a/net-misc/ntp/files/4.2.0-linux-config-phone.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- ntpd/ntp_config.c.orig 2003-10-17 23:47:28.624463400 -0400 -+++ ntpd/ntp_config.c 2003-10-17 23:47:36.409279928 -0400 -@@ -9,15 +9,6 @@ - # include <netinfo/ni.h> - #endif - --#include "ntpd.h" --#include "ntp_io.h" --#include "ntp_unixtime.h" --#include "ntp_refclock.h" --#include "ntp_filegen.h" --#include "ntp_stdlib.h" --#include "ntp_config.h" --#include "ntp_cmdargs.h" -- - #include <stdio.h> - #include <ctype.h> - #ifdef HAVE_SYS_PARAM_H -@@ -40,6 +31,15 @@ - - #include <netdb.h> - -+#include "ntpd.h" -+#include "ntp_io.h" -+#include "ntp_unixtime.h" -+#include "ntp_refclock.h" -+#include "ntp_filegen.h" -+#include "ntp_stdlib.h" -+#include "ntp_config.h" -+#include "ntp_cmdargs.h" -+ - extern int priority_done; - - /* diff --git a/net-misc/ntp/files/4.2.0-ntpdate-quiet.patch b/net-misc/ntp/files/4.2.0-ntpdate-quiet.patch deleted file mode 100644 index 378d62511ecf..000000000000 --- a/net-misc/ntp/files/4.2.0-ntpdate-quiet.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ntpdate/ntpdate.c.orig 2003-07-17 06:27:30.000000000 -0400 -+++ ntpdate/ntpdate.c 2003-12-03 18:01:17.119094200 -0500 -@@ -199,6 +199,7 @@ - * Miscellaneous flags - */ - int verbose = 0; -+int quiet = 0; - int always_step = 0; - int never_step = 0; - -@@ -288,6 +289,7 @@ - */ - complete_servers = 0; - verbose = 0; -+ quiet = 0; - always_step = 0; - never_step = 0; - } -@@ -357,7 +359,7 @@ - /* - * Decode argument list - */ -- while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qr:st:uv")) != EOF) -+ while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qr:st:uvQ")) != EOF) - switch (c) - { - case '4': -@@ -443,6 +445,9 @@ - case 'v': - verbose = 1; - break; -+ case 'Q': -+ quiet = 1; -+ break; - case 'u': - unpriv_port = 1; - break; -@@ -1348,7 +1353,7 @@ - return; - } - else { -- fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr)); -+ fprintf((quiet?stdout:stderr), "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr)); - } - - server = (struct server *)emalloc(sizeof(struct server)); diff --git a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch deleted file mode 100644 index a7c35e388a80..000000000000 --- a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://ntp.isc.org/bugs/show_bug.cgi?id=464 - ---- ntpd/ntp_proto.c -+++ ntpd/ntp_proto.c -@@ -2293,8 +2293,8 @@ - if (debug > 1) - printf("select: prefer offset %.6f\n", - sys_offset); -- } - #endif -+ } - } else { - - /* diff --git a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch b/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch deleted file mode 100644 index 9eae0496a865..000000000000 --- a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://ntp.isc.org/bugs/show_bug.cgi?id=465 - ---- ntpd/ntp_io.c -+++ ntpd/ntp_io.c -@@ -1795,16 +1795,16 @@ - sizeof(rb->recv_space), 0, - (struct sockaddr *)&rb->recv_srcadr, - &fromlen); -- if (rb->recv_length == 0 -+ if (rb->recv_length == 0 || rb->recv_length == -1 && (0 - #ifdef EWOULDBLOCK - || errno==EWOULDBLOCK - #endif - #ifdef EAGAIN - || errno==EAGAIN - #endif -- ) { -+ )) { - freerecvbuf(rb); -- continue; -+ continue; - } - else if (rb->recv_length < 0) - { diff --git a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch deleted file mode 100644 index 4ca3c5367722..000000000000 --- a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://ntp.isc.org/bugs/show_bug.cgi?id=438 - ---- ntpdc/ntpdc.c -+++ ntpdc/ntpdc.c -@@ -449,7 +449,11 @@ - hints.ai_flags = AI_NUMERICHOST; - - a_info = getaddrinfo(hname, service, &hints, &ai); -- if (a_info == EAI_NONAME || a_info == EAI_NODATA) { -+ if (a_info == EAI_NONAME -+#ifdef EAI_NODATA -+ || a_info == EAI_NODATA -+#endif -+ ) { - hints.ai_flags = AI_CANONNAME; - #ifdef AI_ADDRCONFIG - hints.ai_flags |= AI_ADDRCONFIG; ---- ntpq/ntpq.c -+++ ntpq/ntpq.c -@@ -631,7 +631,11 @@ - hints.ai_flags = AI_NUMERICHOST; - - a_info = getaddrinfo(hname, service, &hints, &ai); -- if (a_info == EAI_NONAME || a_info == EAI_NODATA) { -+ if (a_info == EAI_NONAME -+#ifdef EAI_NODATA -+ || a_info == EAI_NODATA -+#endif -+ ) { - hints.ai_flags = AI_CANONNAME; - #ifdef AI_ADDRCONFIG - hints.ai_flags |= AI_ADDRCONFIG; diff --git a/net-misc/ntp/files/4.2.0.20040617-hostname.patch b/net-misc/ntp/files/4.2.0.20040617-hostname.patch deleted file mode 100644 index 443a57e1b30d..000000000000 --- a/net-misc/ntp/files/4.2.0.20040617-hostname.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nur ntp-stable-4.2.0a-20040617/html/authopt.html ntp-stable-4.2.0a-20040617-hostname/html/authopt.html ---- ntp-stable-4.2.0a-20040617/html/authopt.html 2004-05-25 11:02:21.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/html/authopt.html 2005-05-06 15:17:14.273461874 +0000 -@@ -89,6 +89,8 @@ - <dt><tt>sign <i>file</i></tt> - <dd>Specifies the location of the optional sign key file. This overrides the link <tt>ntpkey_sign_<i>hostname</i></tt> in the keys directory. If this file is not found, the host key is also the sign key. - </dl> -+ <dt><tt>hostname <i>hostname</i></tt> -+ <dd>This command specifies a hostname to use instead of the hostname returned by <tt>gethostname()</tt>. Setting this affects all the filenames for cryptographic data as well as the hostname transmitted to other systems. Single filenames can still be overridden by options to the <tt>crypto</tt> command. The hostname has to be between 4 and 128 characters long. - <dt><tt>keys <i>keyfile</i></tt> - <dd>Specifies the complete path and location of the MD5 key file containing the keys and key identifiers used by <tt>ntpd</tt>, <tt>ntpq</tt> and <tt>ntpdc</tt> when operating with symmetric key cryptography. This is the same operation as the <tt>-k </tt>command line option. - <dt><tt>keysdir <i>path</i></tt> -diff -Nur ntp-stable-4.2.0a-20040617/html/keygen.html ntp-stable-4.2.0a-20040617-hostname/html/keygen.html ---- ntp-stable-4.2.0a-20040617/html/keygen.html 2004-02-25 05:57:40.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/html/keygen.html 2005-05-06 15:18:57.423173962 +0000 -@@ -36,6 +36,7 @@ - <p>This program generates cryptographic data files used by the NTPv4 authentication and identification schemes. It generates MD5 key files used in symmetric key cryptography. In addition, if the OpenSSL software library has been installed, it generates keys, certificate and identity files used in public key cryptography. These files are used for cookie encryption, digital signature and challenge/response identification algorithms compatible with the Internet standard security infrastructure.</p> - <p>All files are in PEM-encoded printable ASCII format, so they can be embedded as MIME attachments in mail to other sites and certificate authorities. By default, files are not encrypted. The <tt>-p <i>password</i></tt> option specifies the write password and <tt>-q <i>password</i></tt> option the read password for previously encrypted files. The <tt>ntp-keygen</tt> program prompts for the password if it reads an encrypted file and the password is missing or incorrect. If an encrypted file is read successfully and no write password is specified, the read password is used as the write password by default.</p> - <p>The <tt>ntpd</tt> configuration command <tt>crypto pw <i>password</i></tt> specifies the read password for previously encrypted files. The daemon expires on the spot if the password is missing or incorrect. For convenience, if a file has been previously encrypted, the default read password is the name of the host running the program. If the previous write password is specified as the host name, these files can be read by that host with no explicit password.</p> -+ <p>The <tt>ntpd</tt> daemon requires hostnames to be between 4 and 128 chars in length. If you do not have set your hostname to a fully qualified domain name, and your hostname is shorter than 4 characters, you need to specify a hostname in the config file that is long enough. This can be done via the <tt>hostname</tt> command. This command is also useful, if the name you want to give your time server (e.g. time.domain.org) is different from the machines hostname. If you specifiy an alternate hostname, the keys and certificates need to have matching names in the subject and issuer fields. This can be done with the <tt>-s</tt> and <tt>-i</tt> options of <tt>ntp-keygen</tt>.</p> - <p>File names begin with the prefix <tt>ntpkey_</tt> and end with the postfix <tt><i>_hostname.filestamp</i></tt>, where <tt><i>hostname</i></tt> is the owner name, usually the string returned by the Unix <tt>gethostname()</tt> routine, and <tt><i>filestamp</i></tt> is the NTP seconds when the file was generated, in decimal digits. This both guarantees uniqueness and simplifies maintenance procedures, since all files can be quickly removed by a <tt>rm ntpkey*</tt> command or all files generated at a specific time can be removed by a <tt>rm *<i>filestamp</i></tt> command. To further reduce the risk of misconfiguration, the first two lines of a file contain the file name and generation date and time as comments.</p> - <p>All files are installed by default in the keys directory <tt>/usr/local/etc</tt>, which is normally in a shared filesystem in NFS-mounted networks. The actual location of the keys directory and each file can be overridden by configuration commands, but this is not recommended. Normally, the files for each host are generated by that host and used only by that host, although exceptions exist as noted later on this page.</p> - <p>Normally, files containing private values, including the host key, sign key and identification parameters, are permitted root read/write-only; while others containing public values are permitted world readable. Alternatively, files containing private values can be encrypted and these files permitted world readable, which simplifies maintenance in shared file systems. Since uniqueness is insured by the hostname and file name extensions, the files for a NFS server and dependent clients can all be installed in the same shared directory.</p> -diff -Nur ntp-stable-4.2.0a-20040617/include/ntp_config.h ntp-stable-4.2.0a-20040617-hostname/include/ntp_config.h ---- ntp-stable-4.2.0a-20040617/include/ntp_config.h 2004-02-25 05:57:55.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/include/ntp_config.h 2005-05-06 15:29:27.108952247 +0000 -@@ -59,6 +59,7 @@ - #define CONFIG_CDELAY 38 - #ifdef OPENSSL - #define CONFIG_CRYPTO 39 -+#define CONFIG_HOSTNAME 40 - #endif /* OPENSSL */ - - /* -diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_config.c ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_config.c ---- ntp-stable-4.2.0a-20040617/ntpd/ntp_config.c 2004-05-25 11:02:24.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_config.c 2005-05-06 15:32:56.319973120 +0000 -@@ -75,6 +75,9 @@ - { "enable", CONFIG_ENABLE }, - { "filegen", CONFIG_FILEGEN }, - { "fudge", CONFIG_FUDGE }, -+#ifdef OPENSSL -+ { "hostname", CONFIG_HOSTNAME }, -+#endif /* OPENSSL */ - { "includefile", CONFIG_INCLUDEFILE }, - { "keys", CONFIG_KEYS }, - { "keysdir", CONFIG_KEYSDIR }, -@@ -1760,6 +1763,18 @@ - } - break; - -+#ifdef OPENSSL -+ case CONFIG_HOSTNAME: -+ if (ntokens != 2) { -+ syslog(LOG_ERR, "Invalid value for hostname command in config"); -+ continue; -+ } -+ int namlen = min(strlen(tokens[1]) + 1, MAXFILENAME); -+ sys_hostname = emalloc(namlen); -+ strncpy(sys_hostname, tokens[1], namlen); -+ break; -+#endif /* OPENSSL */ -+ - } - } - if (fp[0]) -diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_crypto.c ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_crypto.c ---- ntp-stable-4.2.0a-20040617/ntpd/ntp_crypto.c 2004-05-25 11:02:24.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_crypto.c 2005-05-06 15:31:37.729859128 +0000 -@@ -3752,10 +3752,12 @@ - if (!crypto_flags) - return; - -- gethostname(filename, MAXFILENAME); -- bytes = strlen(filename) + 1; -- sys_hostname = emalloc(bytes); -- memcpy(sys_hostname, filename, bytes); -+ if (sys_hostname == NULL) { -+ gethostname(filename, MAXFILENAME); -+ bytes = strlen(filename) + 1; -+ sys_hostname = emalloc(bytes); -+ memcpy(sys_hostname, filename, bytes); -+ } - if (passwd == NULL) - passwd = sys_hostname; - memset(&hostval, 0, sizeof(hostval)); -diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_proto.c ---- ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c 2004-05-25 11:02:24.000000000 +0000 -+++ ntp-stable-4.2.0a-20040617-hostname/ntpd/ntp_proto.c 2005-05-06 15:30:40.095842376 +0000 -@@ -63,7 +63,7 @@ - int peer_ntpdate; /* active peers in ntpdate mode */ - int sys_survivors; /* truest of the truechimers */ - #ifdef OPENSSL --char *sys_hostname; /* gethostname() name */ -+char *sys_hostname = NULL; /* gethostname() name */ - #endif /* OPENSSL */ - - /* diff --git a/net-misc/ntp/files/4.2.0.20040617-ipv6-fixes.patch b/net-misc/ntp/files/4.2.0.20040617-ipv6-fixes.patch deleted file mode 100644 index 95969b62e537..000000000000 --- a/net-misc/ntp/files/4.2.0.20040617-ipv6-fixes.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nur ntp-stable-4.2.0a-20040617/ntpdate/ntpdate.c ntp-stable-4.2.0a-20050303/ntpdate/ntpdate.c ---- ntp-stable-4.2.0a-20040617/ntpdate/ntpdate.c 2004-05-25 13:02:25.000000000 +0200 -+++ ntp-stable-4.2.0a-20050303/ntpdate/ntpdate.c 2005-03-03 12:01:15.000000000 +0100 -@@ -1321,6 +1321,30 @@ - } - - -+/* -+ * is_unreachable - check to see if we have a route to given destination -+ * (non-blocking). -+ */ -+static int -+is_reachable (struct sockaddr_storage *dst) -+{ -+ SOCKET sockfd; -+ -+ sockfd = socket(dst->ss_family, SOCK_DGRAM, 0); -+ if (sockfd == -1) { -+ return 0; -+ } -+ -+ if(connect(sockfd, (struct sockaddr *)dst, SOCKLEN(dst))) { -+ closesocket(sockfd); -+ return 0; -+ } -+ closesocket(sockfd); -+ return 1; -+} -+ -+ -+ - /* XXX ELIMINATE: merge BIG slew into adj_systime in lib/systime.c */ - /* - * addserver - determine a server's address and allocate a new structure -@@ -1333,7 +1357,7 @@ - { - register struct server *server; - /* Address infos structure to store result of getaddrinfo */ -- struct addrinfo *addrResult; -+ struct addrinfo *addrResult, *ptr; - /* Address infos structure to store hints for getaddrinfo */ - struct addrinfo hints; - /* Error variable for getaddrinfo */ -@@ -1364,22 +1388,28 @@ - } - #endif - -- server = (struct server *)emalloc(sizeof(struct server)); -- memset((char *)server, 0, sizeof(struct server)); -- -- /* For now we only get the first returned server of the addrinfo list */ -- memset(&(server->srcadr), 0, sizeof(struct sockaddr_storage)); -- memcpy(&(server->srcadr), addrResult->ai_addr, addrResult->ai_addrlen); -- server->event_time = ++sys_numservers; -- if (sys_servers == NULL) -- sys_servers = server; -- else { -- struct server *sp; -- -- for (sp = sys_servers; sp->next_server != NULL; -- sp = sp->next_server) ; -- sp->next_server = server; -+ /* We must get all returned server in case the first one fails */ -+ for (ptr = addrResult; ptr != NULL; ptr = ptr->ai_next) { -+ if (is_reachable ((struct sockaddr_storage *)ptr->ai_addr)) { -+ server = (struct server *)emalloc(sizeof(struct server)); -+ memset((char *)server, 0, sizeof(struct server)); -+ -+ memset(&(server->srcadr), 0, sizeof(struct sockaddr_storage)); -+ memcpy(&(server->srcadr), ptr->ai_addr, ptr->ai_addrlen); -+ server->event_time = ++sys_numservers; -+ if (sys_servers == NULL) -+ sys_servers = server; -+ else { -+ struct server *sp; -+ -+ for (sp = sys_servers; sp->next_server != NULL; -+ sp = sp->next_server) ; -+ sp->next_server = server; -+ } -+ } - } -+ -+ freeaddrinfo(addrResult); - } - - diff --git a/net-misc/ntp/files/broadcastclient.patch b/net-misc/ntp/files/broadcastclient.patch deleted file mode 100644 index 1405a8b8c8d9..000000000000 --- a/net-misc/ntp/files/broadcastclient.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ntpd/ntp_proto.c.orig 2003-08-06 01:12:02.000000000 -0400 -+++ ntpd/ntp_proto.c 2003-08-06 01:12:31.000000000 -0400 -@@ -351,8 +351,7 @@ - * Discard broadcast packets received on the wildcard interface - * or if not enabled as broadcast client. - */ -- if (PKT_MODE(pkt->li_vn_mode) == MODE_BROADCAST && -- (rbufp->dstadr == any_interface || !sys_bclient)) -+ if (PKT_MODE(pkt->li_vn_mode) == MODE_BROADCAST && (!sys_bclient)) - return; - - /* diff --git a/net-misc/ntp/files/digest-ntp-4.1.2 b/net-misc/ntp/files/digest-ntp-4.1.2 deleted file mode 100644 index 28b433f059b6..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.1.2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 66f59d0eef99784e14b78157c87b97fa ntp-4.1.2-manpages.tbz2 19961 -RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd5c ntp-4.1.2-manpages.tbz2 19961 -SHA256 2b1174f9158c1af00bfbda451719321cea2f8b98d68d0b54e2f087d347195835 ntp-4.1.2-manpages.tbz2 19961 -MD5 98e16c7aa4ecd4c004b51bff18962e95 ntp-4.1.2.tar.gz 2168384 -RMD160 053bc86725a923784da6af37f6a844f6a9819d03 ntp-4.1.2.tar.gz 2168384 -SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a ntp-4.1.2.tar.gz 2168384 diff --git a/net-misc/ntp/files/digest-ntp-4.2.0-r2 b/net-misc/ntp/files/digest-ntp-4.2.0-r2 deleted file mode 100644 index 5b725f4e9dfd..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.0-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 0333bcec9a94b17621c785ccae674285 ntp-4.2.0-r2-manpages.tar.bz2 25355 -RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 ntp-4.2.0-r2-manpages.tar.bz2 25355 -SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3 ntp-4.2.0-r2-manpages.tar.bz2 25355 -MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502 -RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 ntp-4.2.0.tar.gz 2514502 -SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25 ntp-4.2.0.tar.gz 2514502 diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3 b/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3 deleted file mode 100644 index 9044df5fe442..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 0f2d809eb4a360dd4479b00cfd95bc4e ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 -RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 -SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 -MD5 d0554ae42164bcda990e6318648a7c58 ntp-stable-4.2.0a-20040617.tar.gz 2435648 -RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 ntp-stable-4.2.0a-20040617.tar.gz 2435648 -SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3 ntp-stable-4.2.0a-20040617.tar.gz 2435648 diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1 b/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1 deleted file mode 100644 index 78587defbab1..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d3a5a6185ef5ed71d2fa8e06598fc28f ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 -RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 -SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 -MD5 20b8d0616b637b8584147db39a754326 ntp-stable-4.2.0a-20050303.tar.gz 2446073 -RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d ntp-stable-4.2.0a-20050303.tar.gz 2446073 -SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c ntp-stable-4.2.0a-20050303.tar.gz 2446073 diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20060224 b/net-misc/ntp/files/digest-ntp-4.2.0.20060224 deleted file mode 100644 index 87177ae99e14..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.0.20060224 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 a3e5d74ece8eb066d93592a645b054b1 ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 -RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 -SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 -MD5 49d4a704b49dc1ef2a7ec0b7938c3ae1 ntp-stable-4.2.0a-20060224.tar.gz 2447194 -RMD160 36bcce870220fb670d63c4b05a968075f990ca9c ntp-stable-4.2.0a-20060224.tar.gz 2447194 -SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1 ntp-stable-4.2.0a-20060224.tar.gz 2447194 diff --git a/net-misc/ntp/files/digest-ntp-4.2.2 b/net-misc/ntp/files/digest-ntp-4.2.2 deleted file mode 100644 index fa66f4cb72ee..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 6f51d450cfaef5b898f5ee6fff5499a5 ntp-4.2.2-manpages.tar.bz2 25213 -RMD160 ac90f9b371fe6cd6bfdf931fd53432e054e7ce8a ntp-4.2.2-manpages.tar.bz2 25213 -SHA256 290e5a2ccb61960c7c35b07ac5255c8efa0721858fd85594792b62daa2852bc0 ntp-4.2.2-manpages.tar.bz2 25213 -MD5 111d879acdcc955e60f527575ab0a71a ntp-4.2.2.tar.gz 2546027 -RMD160 2cf9540cf2e6c5fc3e3d8922676ea3b2efb9215e ntp-4.2.2.tar.gz 2546027 -SHA256 fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc ntp-4.2.2.tar.gz 2546027 diff --git a/net-misc/ntp/files/digest-ntp-4.2.2_p2 b/net-misc/ntp/files/digest-ntp-4.2.2_p2 deleted file mode 100644 index 9bf17bbed341..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.2.2_p2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d42b28df83b9c08850f5b92d4f17a8a3 ntp-4.2.2p2-manpages.tar.bz2 48744 -RMD160 e684f7e0fc285b0cd469346859e9daf8ead413fc ntp-4.2.2p2-manpages.tar.bz2 48744 -SHA256 1ca88851575e7cb2fc9c48409e26da89048ac78e4098f5a4f6d504846de28690 ntp-4.2.2p2-manpages.tar.bz2 48744 -MD5 5c6ca6fab651c9cb21754a6478b8650e ntp-4.2.2p2.tar.gz 2563137 -RMD160 3c4c01c902be0afe92dd15d52c746549bd26d27f ntp-4.2.2p2.tar.gz 2563137 -SHA256 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923 ntp-4.2.2p2.tar.gz 2563137 diff --git a/net-misc/ntp/files/linux-config-phone.patch b/net-misc/ntp/files/linux-config-phone.patch deleted file mode 100644 index c5bcf92c4339..000000000000 --- a/net-misc/ntp/files/linux-config-phone.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- ntpd/ntp_config.c.orig 2001-11-19 21:12:15.000000000 -0500 -+++ ntpd/ntp_config.c 2003-01-01 21:50:37.000000000 -0500 -@@ -9,15 +9,6 @@ - # include <netinfo/ni.h> - #endif - --#include "ntpd.h" --#include "ntp_io.h" --#include "ntp_unixtime.h" --#include "ntp_refclock.h" --#include "ntp_filegen.h" --#include "ntp_stdlib.h" --#include "ntp_config.h" --#include "ntp_cmdargs.h" -- - #ifdef PUBKEY - # include "ntp_crypto.h" - #endif /* PUBKEY */ -@@ -42,6 +33,15 @@ - extern HANDLE ResolverThreadHandle; - #endif /* SYS_WINNT */ - -+#include "ntpd.h" -+#include "ntp_io.h" -+#include "ntp_unixtime.h" -+#include "ntp_refclock.h" -+#include "ntp_filegen.h" -+#include "ntp_stdlib.h" -+#include "ntp_config.h" -+#include "ntp_cmdargs.h" -+ - extern int priority_done; - - /* diff --git a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch b/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch deleted file mode 100644 index 02a7375f0e4a..000000000000 --- a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ntp-4.1.1b/include/ntp_syscall.h 2003-01-06 18:51:39.000000000 +0100 -+++ ntp-4.1.1b-alpha/include/ntp_syscall.h 2003-01-06 18:54:57.000000000 +0100 -@@ -14,7 +14,7 @@ - # include <sys/timex.h> - #endif - --#ifndef NTP_SYSCALLS_LIBC -+#if !defined(NTP_SYSCALLS_LIBC) || defined(__alpha__) - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) - # define ntp_gettime(t) syscall(SYS_ntp_gettime, (t)) diff --git a/net-misc/ntp/files/ntp-4.2.0-gcc4.patch b/net-misc/ntp/files/ntp-4.2.0-gcc4.patch deleted file mode 100644 index 114672d7f49c..000000000000 --- a/net-misc/ntp/files/ntp-4.2.0-gcc4.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h.gcc4 2005-03-08 14:29:42.940559784 +0100 -+++ ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h 2005-03-08 14:29:43.015548384 +0100 -@@ -133,10 +133,6 @@ - extern u_char * cache_key; /* key pointer */ - extern u_int cache_keylen; /* key length */ - --/* clocktypes.c */ --struct clktype; --extern struct clktype clktypes[]; -- - /* getopt.c */ - extern char * ntp_optarg; /* global argument pointer */ - extern int ntp_optind; /* global argv index */ ---- ntp-stable-4.2.0a-20040617/include/ntp_refclock.h.gcc4 2004-02-25 06:57:56.000000000 +0100 -+++ ntp-stable-4.2.0a-20040617/include/ntp_refclock.h 2005-03-08 14:29:43.015548384 +0100 -@@ -65,6 +65,7 @@ - const char *clocktype; /* long description */ - const char *abbrev; /* short description */ - }; -+extern struct clktype clktypes[]; - - /* - * Configuration flag values ---- ntp-stable-4.2.0a-20040617/include/ntpd.h.gcc4 2004-05-25 13:02:24.000000000 +0200 -+++ ntp-stable-4.2.0a-20040617/include/ntpd.h 2005-03-08 14:29:43.016548232 +0100 -@@ -225,8 +225,6 @@ - #endif - - /* ntp_control.c */ --struct ctl_trap; --extern struct ctl_trap ctl_trap[]; - extern int num_ctl_traps; - extern keyid_t ctl_auth_keyid; /* keyid used for authenticating write requests */ - ---- ntp-stable-4.2.0a-20040617/include/ntp_control.h.gcc4 2004-05-25 13:02:23.000000000 +0200 -+++ ntp-stable-4.2.0a-20040617/include/ntp_control.h 2005-03-08 14:29:43.016548232 +0100 -@@ -268,6 +268,7 @@ - u_char tr_flags; /* trap flags */ - u_char tr_version; /* version number of trapper */ - }; -+extern struct ctl_trap ctl_trap[]; - - /* - * Flag bits diff --git a/net-misc/ntp/files/ntp-4.2.0-ntpd-using-wrong-group.patch b/net-misc/ntp/files/ntp-4.2.0-ntpd-using-wrong-group.patch deleted file mode 100644 index c5865753858f..000000000000 --- a/net-misc/ntp/files/ntp-4.2.0-ntpd-using-wrong-group.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/103719 -https://ntp.isc.org/bugs/show_bug.cgi?id=392 - ---- ntpd/ntpd.c -+++ ntpd/ntpd.c -@@ -881,7 +881,7 @@ - } else { - getgroup: - if ((gr = getgrnam(group)) != NULL) { -- sw_gid = pw->pw_gid; -+ sw_gid = gr->gr_gid; - } else { - errno = 0; - msyslog(LOG_ERR, "Cannot find group `%s'", group); diff --git a/net-misc/ntp/files/ntp-4.2.0.20050303-rlimit-memlock.patch b/net-misc/ntp/files/ntp-4.2.0.20050303-rlimit-memlock.patch deleted file mode 100644 index 22e676b76db5..000000000000 --- a/net-misc/ntp/files/ntp-4.2.0.20050303-rlimit-memlock.patch +++ /dev/null @@ -1,25 +0,0 @@ -A proper fix has been accepted upstream, this is just a simple workaround. - -http://lists.ntp.isc.org/pipermail/hackers/2005-June/001418.html -http://bugs.gentoo.org/show_bug.cgi?id=99713 -https://ntp.isc.org/bugs/show_bug.cgi?id=477 - ---- ntpd/ntpd.c -+++ ntpd/ntpd.c -@@ -691,6 +691,16 @@ - "Cannot adjust stack limit for mlockall: %m"); - } - } -+ /* -+ * The default RLIMIT_MEMLOCK is very low on Linux systems. -+ * Unless we increase this limit malloc calls are likely to -+ * fail if we drop root privlege. To be useful the value -+ * has to be larger than the largest ntpd resident set size. -+ */ -+ rl.rlim_cur = rl.rlim_max = 32*1024*1024; -+ if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) { -+ msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m"); -+ } - } - # endif /* HAVE_SETRLIMIT */ - /* diff --git a/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch b/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch deleted file mode 100644 index 039a5663dd2d..000000000000 --- a/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ntp-4.2.2p2/sntp/socket.c 2006-07-09 07:01:46.000000000 -0400 -+++ ntp-4.2.2/sntp/socket.c 2006-06-06 16:17:16.000000000 -0400 -@@ -8,8 +8,6 @@ - - - --#include "config.h" -- - #include "header.h" - #include "internet.h" - #include <fcntl.h> diff --git a/net-misc/ntp/files/ntp-client-4.1.2.rc b/net-misc/ntp/files/ntp-client-4.1.2.rc deleted file mode 100644 index 2d80a4efbed8..000000000000 --- a/net-misc/ntp/files/ntp-client-4.1.2.rc +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client-4.1.2.rc,v 1.2 2004/07/15 00:05:46 agriffis Exp $ - -depend() { - before cron - need net - use dns logger -} - -checkconfig() { - if [ ! -x "`which ${NTPCLIENT_CMD} 2>/dev/null`" ] ; then - eerror "Please edit /etc/conf.d/ntp-client" - eerror "Unable to locate the client command ${NTPCLIENT_CMD}!" - return 1 - fi - if [ -z "${NTPCLIENT_OPTS}" ] ; then - eerror "Please edit /etc/conf.d/ntp-client" - eerror "I need to know what server/options to use!" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - ebegin "Setting clock via the ntp client '${NTPCLIENT_CMD}'" - ${NTPCLIENT_CMD} >/dev/null ${NTPCLIENT_OPTS} - eend $? "Failed to set clock" -} diff --git a/net-misc/ntp/files/ntpd-4.1.2.confd b/net-misc/ntp/files/ntpd-4.1.2.confd deleted file mode 100644 index 804271146872..000000000000 --- a/net-misc/ntp/files/ntpd-4.1.2.confd +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/conf.d/ntpd - -# Options to pass to the ntpd process -# Most people should leave this line alone ... -# however, if you know what you're doing, feel free to tweak -NTPD_OPTS="-U ntp" diff --git a/net-misc/ntp/files/ntpd-4.1.2.rc b/net-misc/ntp/files/ntpd-4.1.2.rc deleted file mode 100644 index a8339489a998..000000000000 --- a/net-misc/ntp/files/ntpd-4.1.2.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.rc,v 1.3 2004/07/15 00:05:46 agriffis Exp $ - -depend() { - need net - use dns logger - after ntp-client -} - -checkconfig() { - if [ ! -f /etc/ntp.conf ] ; then - eerror "Please create /etc/ntp.conf" - eerror "Sample conf: /usr/share/ntp/ntp.conf" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - ebegin "Starting ntpd" - touch /var/run/ntpd.pid - chown ntp:ntp /var/run/ntpd.pid - /usr/bin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS} - eend $? "Failed to start ntpd" -} - -stop() { - ebegin "Stopping ntpd" - start-stop-daemon --stop --pidfile /var/run/ntpd.pid - eend $? "Failed to stop ntpd" - rm -f /var/run/ntpd.pid -} diff --git a/net-misc/ntp/ntp-4.1.2.ebuild b/net-misc/ntp/ntp-4.1.2.ebuild deleted file mode 100644 index 9d7ac76773a1..000000000000 --- a/net-misc/ntp/ntp-4.1.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.2.ebuild,v 1.41 2005/07/20 22:38:40 flameeyes Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz - mirror://gentoo/${PF}-manpages.tbz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 hppa mips ppc sparc x86" -IUSE="parse-clocks selinux ssl" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - sys-libs/libcap - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - || ( - dev-libs/libelf - dev-libs/elfutils - ) - >=sys-devel/autoconf-2.58 - >=sys-devel/automake-1.7.7 - >=sys-apps/sed-4.0.5" - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir ${T}/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > ${T}/fakebin/bk - chmod a+x ${T}/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -src_unpack() { - unpack ${A} - cd ${S} - - use alpha && epatch ${FILESDIR}/ntp-4.1.1b-syscall-libc.patch - epatch ${FILESDIR}/broadcastclient.patch #17336 - epatch ${FILESDIR}/${PV}-droproot.patch #21444 - - epatch ${FILESDIR}/linux-config-phone.patch #13001 - sed -i "s:-Wpointer-arith::" configure.in - - # needed in order to make files with right ver info #30220. - aclocal -I . || die "autolocal" - automake || die "automake" - autoconf || die "autoconf" -} - -src_compile() { - hax_bitkeeper - - local mysslconf - use ssl \ - && mysslconf="--with-openssl-libdir=yes" \ - || mysslconf="--with-openssl-libdir=no" - econf \ - `use_enable parse-clocks` \ - ${mysslconf} \ - || die - - emake || die -} - -pkg_preinst() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_install() { - hax_bitkeeper - pkg_preinst - - make install DESTDIR=${D} || die - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman ${WORKDIR}/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins ${FILESDIR}/ntp.conf - rm -rf `find scripts/ \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support` - mv scripts/* ${D}/usr/share/ntp/ - chmod -R go-w ${D}/usr/share/ntp - - [ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf - exeinto /etc/init.d - newexe ${FILESDIR}/ntpd-${PV}.rc ntpd - newexe ${FILESDIR}/ntp-client-${PV}.rc ntp-client - insinto /etc/conf.d - newins ${FILESDIR}/ntpd-${PV}.confd ntpd - newins ${FILESDIR}/ntp-client.confd ntp-client - - dodir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - touch ${D}/var/lib/ntp/ntp.drift - fowners ntp:ntp /var/lib/ntp/ntp.drift -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" -} diff --git a/net-misc/ntp/ntp-4.2.0-r2.ebuild b/net-misc/ntp/ntp-4.2.0-r2.ebuild deleted file mode 100644 index 9bf0ce117cdf..000000000000 --- a/net-misc/ntp/ntp-4.2.0-r2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.26 2006/05/25 22:33:48 exg Exp $ - -inherit eutils flag-o-matic gnuconfig - -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz - mirror://gentoo/${PF}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86 ia64" -IUSE="parse-clocks caps selinux ssl" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - caps? ( sys-libs/libcap ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.58 - >=sys-devel/automake-1.7.7 - >=sys-apps/sed-4.0.5" - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir ${T}/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > ${T}/fakebin/bk - chmod a+x ${T}/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - use alpha && epatch "${FILESDIR}"/ntp-4.1.1b-syscall-libc.patch - - epatch "${FILESDIR}"/${PV}-ntpdate-quiet.patch - epatch "${FILESDIR}"/${PV}-linux-config-phone.patch #13001 - epatch "${FILESDIR}"/${PV}-droproot.patch - epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719 - sed -i "s:-Wpointer-arith::" configure.in - - # needed in order to make files with right ver info #30220 - aclocal -I . || die "aclocal" - automake || die "automake" - autoconf || die "autoconf" - - sed -i \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" - - gnuconfig_update -} - -src_compile() { - hax_bitkeeper - - local mysslconf - use ssl \ - && mysslconf="--with-openssl-libdir=yes" \ - || mysslconf="--with-openssl-libdir=no" - econf \ - `use_enable caps linuxcaps` \ - `use_enable parse-clocks` \ - ${mysslconf} \ - || die - - emake || die -} - -pkg_preinst() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_install() { - hax_bitkeeper - pkg_preinst - - make install DESTDIR=${D} || die - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman ${WORKDIR}/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - rm -rf `find scripts/ \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support` - cp -r scripts/* ${D}/usr/share/ntp/ - chmod -R go-w ${D}/usr/share/ntp - - [ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins "${FILESDIR}"/ntp.conf - exeinto /etc/init.d - newexe "${FILESDIR}"/ntpd.rc ntpd - newexe "${FILESDIR}"/ntp-client.rc ntp-client - insinto /etc/conf.d - newins "${FILESDIR}"/ntpd.confd ntpd - newins "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - - dodir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - touch ${D}/var/lib/ntp/ntp.drift - fowners ntp:ntp /var/lib/ntp/ntp.drift -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [ ! -z "$(egrep '^[^#].*notrust' ${ROOT}/etc/ntp.conf)" ] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/show_bug.cgi?id=41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild b/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild deleted file mode 100644 index 3cc6a8a5d2b8..000000000000 --- a/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild,v 1.5 2006/05/25 22:33:48 exg Exp $ - -inherit eutils - -MY_P=${PN}-stable-${PV:0:5}a-${PV:6} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/${PV:6:4}/${PV:10:2}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - !openntpd? ( !net-misc/openntpd ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir "${T}"/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk - chmod a+x "${T}"/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/ntp-4.1.1b-syscall-libc.patch - epatch "${FILESDIR}"/4.2.0-linux-config-phone.patch #13001 - epatch "${FILESDIR}"/${PV}-hostname.patch - epatch "${FILESDIR}"/${PV}-errno-fix.patch - epatch "${FILESDIR}"/${PV}-ipv6-fixes.patch - epatch "${FILESDIR}"/${PV}-debug-fix.patch - epatch "${FILESDIR}"/${PV}-freebsd.patch - epatch "${FILESDIR}"/ntp-4.2.0-gcc4.patch - epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719 - - sed -i \ - -e 's:md5\.h:touch_not_my_md5:g' \ - -e 's:-Wpointer-arith::' \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" -} - -src_compile() { - hax_bitkeeper - econf \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with ssl crypto) \ - || die - emake || die -} - -src_install() { - hax_bitkeeper - make install DESTDIR="${D}" || die - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman "${WORKDIR}"/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${D}"/usr/share/ntp/ - chmod -R go-w "${D}"/usr/share/ntp - find "${D}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed - dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd - - keepdir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/ntp.logrotate ntp - fi - - if use openntpd ; then - cd "${D}" - rm usr/sbin/ntpd - rm -r var/lib - rm etc/{conf,init}.d/ntpd - fi -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/ntp.conf ]] ; then - rm -f "${D}"/etc/ntp.conf - fi -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild b/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild deleted file mode 100644 index df4d3acb9f9f..000000000000 --- a/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild,v 1.6 2006/05/25 22:33:48 exg Exp $ - -inherit eutils - -MY_P=${PN}-stable-${PV:0:5}a-${PV:6} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/${PV:6:4}/${PV:10:2}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - !openntpd? ( !net-misc/openntpd ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir "${T}"/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk - chmod a+x "${T}"/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/4.2.0-linux-config-phone.patch #13001 - epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch - epatch "${FILESDIR}"/4.2.0.20040617-errno-fix.patch - epatch "${FILESDIR}"/4.2.0.20040617-debug-fix.patch - epatch "${FILESDIR}"/4.2.0.20040617-freebsd.patch - epatch "${FILESDIR}"/ntp-4.2.0-gcc4.patch - epatch "${FILESDIR}"/ntp-4.2.0.20050303-rlimit-memlock.patch #99713 - epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719 - - sed -i \ - -e 's:md5\.h:touch_not_my_md5:g' \ - -e 's:-Wpointer-arith::' \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" -} - -src_compile() { - hax_bitkeeper - econf \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with ssl crypto) \ - || die - emake || die -} - -src_install() { - hax_bitkeeper - make install DESTDIR="${D}" || die "install failed" - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman "${WORKDIR}"/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${D}"/usr/share/ntp/ - chmod -R go-w "${D}"/usr/share/ntp - find "${D}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed - dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd - - keepdir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/ntp.logrotate ntp - fi - - if use openntpd ; then - cd "${D}" - rm usr/sbin/ntpd - rm -r var/lib - rm etc/{conf,init}.d/ntpd - fi -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/ntp.conf ]] ; then - rm -f "${D}"/etc/ntp.conf - fi -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.0.20060224.ebuild b/net-misc/ntp/ntp-4.2.0.20060224.ebuild deleted file mode 100644 index 766896e3fd7b..000000000000 --- a/net-misc/ntp/ntp-4.2.0.20060224.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20060224.ebuild,v 1.2 2006/05/25 22:33:48 exg Exp $ - -inherit eutils toolchain-funcs - -MY_P=${PN}-stable-${PV:0:5}a-${PV:6} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/${PV:6:4}/${PV:10:2}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - !openntpd? ( !net-misc/openntpd ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir "${T}"/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk - chmod a+x "${T}"/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/4.2.0-linux-config-phone.patch #13001 - epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch - epatch "${FILESDIR}"/4.2.0.20040617-errno-fix.patch - epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719 - - sed -i \ - -e 's:md5\.h:touch_not_my_md5:g' \ - -e 's:-Wpointer-arith::' \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" - tc-is-cross-compiler || sed -i '/^BUILT_SOURCES/s:=.*:=:' ntpdc/Makefile.in -} - -src_compile() { - hax_bitkeeper - econf \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with ssl crypto) \ - || die - emake || die -} - -src_install() { - hax_bitkeeper - make install DESTDIR="${D}" || die "install failed" - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman "${WORKDIR}"/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${D}"/usr/share/ntp/ - chmod -R go-w "${D}"/usr/share/ntp - find "${D}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed - dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd - - keepdir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/ntp.logrotate ntp - fi - - if use openntpd ; then - cd "${D}" - rm usr/sbin/ntpd - rm -r var/lib - rm etc/{conf,init}.d/ntpd - fi -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/ntp.conf ]] ; then - rm -f "${D}"/etc/ntp.conf - fi -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.2.ebuild b/net-misc/ntp/ntp-4.2.2.ebuild deleted file mode 100644 index ddec5dc9f5f8..000000000000 --- a/net-misc/ntp/ntp-4.2.2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2.ebuild,v 1.1 2006/06/17 07:42:34 vapier Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${P}.tar.gz - mirror://gentoo/${P}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - !openntpd? ( !net-misc/openntpd ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" -PDEPEND="openntpd? ( net-misc/openntpd )" - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir "${T}"/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk - chmod a+x "${T}"/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_unpack() { - unpack ${A} - cd "${S}" - -# epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch - - sed -i \ - -e 's:md5\.h:touch_not_my_md5:g' \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" -} - -src_compile() { - hax_bitkeeper - econf \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with ssl crypto) \ - || die - emake || die -} - -src_install() { - hax_bitkeeper - make install DESTDIR="${D}" || die "install failed" - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman "${WORKDIR}"/man/*.1 - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${D}"/usr/share/ntp/ - chmod -R go-w "${D}"/usr/share/ntp - find "${D}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed - dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd - - keepdir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/ntp.logrotate ntp - fi - - if use openntpd ; then - cd "${D}" - rm usr/sbin/ntpd - rm -r var/lib - rm etc/{conf,init}.d/ntpd - fi -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/ntp.conf ]] ; then - rm -f "${D}"/etc/ntp.conf - fi -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.2_p2.ebuild b/net-misc/ntp/ntp-4.2.2_p2.ebuild deleted file mode 100644 index 393090ae5688..000000000000 --- a/net-misc/ntp/ntp-4.2.2_p2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2_p2.ebuild,v 1.1 2006/07/16 07:03:01 vapier Exp $ - -inherit eutils toolchain-funcs - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - !openntpd? ( !net-misc/openntpd ) - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -hax_bitkeeper() { - # the makefiles have support for bk ... - # basically we have to do this or bk will try to write - # to files in /opt/bitkeeper causing sandbox violations ;( - mkdir "${T}"/fakebin - echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk - chmod a+x "${T}"/fakebin/bk - export PATH="${T}/fakebin:${PATH}" -} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Needs to be ported ... - #epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch - - epatch "${FILESDIR}"/${P}-sntp-header.patch - - sed -i \ - -e 's:md5\.h:touch_not_my_md5:g' \ - -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \ - -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \ - configure || die "sed failed" -} - -src_compile() { - hax_bitkeeper - econf \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with ssl crypto) \ - || die - emake || die -} - -src_install() { - hax_bitkeeper - make install DESTDIR="${D}" || die "install failed" - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${D}"/usr/share/ntp/ - chmod -R go-w "${D}"/usr/share/ntp - find "${D}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name 'rc[12]' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd - dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed - dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd - - keepdir /var/lib/ntp - fowners ntp:ntp /var/lib/ntp - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/ntp.logrotate ntp - fi - - if use openntpd ; then - cd "${D}" - rm usr/sbin/ntpd - rm -r var/lib - rm etc/{conf,init}.d/ntpd - fi -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/ntp.conf ]] ; then - rm -f "${D}"/etc/ntp.conf - fi -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - einfo "The way ntp sets and maintains your system time has changed." - einfo "Now you can use /etc/init.d/ntp-client to set your time at" - einfo "boot while you can use /etc/init.d/ntpd to maintain your time" - einfo "while your machine runs" - if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "http://bugs.gentoo.org/41827" - fi -} |