diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-15 12:52:33 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-15 12:52:33 +0000 |
| commit | 3eb14cfb70c54d43386bc894162e47bb7d2be839 (patch) | |
| tree | 58386c440bed00dbea803132c7bf6677369d8dae /net-misc/ntp | |
| parent | Regen libbdnav autotools when needed #296792 by Martin Berkemeier. (diff) | |
| download | historical-3eb14cfb70c54d43386bc894162e47bb7d2be839.tar.gz historical-3eb14cfb70c54d43386bc894162e47bb7d2be839.tar.bz2 historical-3eb14cfb70c54d43386bc894162e47bb7d2be839.zip | |
Further fix the linking patch to link fine with USE=readline/libedit as well.
Package-Manager: portage-2.2_rc59/cvs/Linux x86_64
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/ntp/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.6-linking.patch | 8 |
3 files changed, 15 insertions, 10 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index bcf6e50a89f9..5aeca42576b3 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.156 2009/12/14 18:47:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.157 2009/12/15 12:52:32 flameeyes Exp $ + + 15 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> + files/ntp-4.2.6-linking.patch: + Further fix the linking patch to link fine with USE=readline/libedit as + well. 14 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> +files/ntp-4.2.6-as-needed.patch, ntp-4.2.6.ebuild: diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 1d5a674f22b8..083678e8a5e1 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -7,7 +7,7 @@ AUX man-pages/ntpdc.html.patch 1620 RMD160 0d240cb9b547b7a056b4f08a93385f5c1f4dc AUX ntp-4.2.4_p5-adjtimex.patch 670 RMD160 54cb1f9e8bf872044cc6e9f2a8a469f03d29af00 SHA1 53b437ce6c200cb9a1d4a1f4b0e543ea6e2c268a SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38 AUX ntp-4.2.4_p7-CVE-2009-3563.patch 1752 RMD160 d259ed78523701ce22dd7aaadc945277b0586dd3 SHA1 3696ce854ea1bca9e2a514cdf883772ee38436e4 SHA256 4a6eb328ccfe3be771dc0932d6f6ee8210868f8c3d5ba09dbe6e9707edd4ce60 AUX ntp-4.2.4_p7-nano.patch 393 RMD160 59096f773b7206f6c9a8a94aa4ca6ac9c6b7a2a4 SHA1 4de6cd3fad1946146107f86d1f161eb835fbb2d3 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4 -AUX ntp-4.2.6-linking.patch 1673 RMD160 ec6b3b5950ed5b0d389fb596657ee6b7f4681510 SHA1 3201413f5a841c6160e082fe15392e6be5d7d1bc SHA256 5ef27ff61d9e9df1bfd54fb12da58bd7f52dba7719f5c804067ff19cadf4d79a +AUX ntp-4.2.6-linking.patch 1673 RMD160 b23c96e4864b3eb038daf65dd9a2ef4c12282b73 SHA1 c771d4c9f01decdd86193d04376a67c82d67cd82 SHA256 06a95e96bca8715aea1191abc250df42e6312f52fa8a4d4fd406a5315d0df7db AUX ntp-client.confd 623 RMD160 e577043438d3e1fffb0bb6a00468d1d5d0bfe3c8 SHA1 a5d618de62c4861e541b066562d2ecac7e7d971a SHA256 e8d5883461f4297c052e3b39814b663965ed3a756c4234675f4a9b62349eca13 AUX ntp-client.rc 833 RMD160 bc24de842f93866a9d7663df81323b8c4ef75afa SHA1 4a794373a29e95889ae5448192affebabdbc322a SHA256 19f6a7fc0cc589e12cf1eaf7681d654d5c4613e8b3ae08dcc1b7dec12da2590c AUX ntp.conf 1517 RMD160 749056c054071b300de2b0a04a4b2a9a7a135da7 SHA1 4d2924d2ea6269b53f12e7f2fa45c3a2be2f2c4b SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9 @@ -23,12 +23,12 @@ EBUILD ntp-4.2.4_p6.ebuild 4135 RMD160 15cec7d894f3a013d330c81ec72e7d920311f9c4 EBUILD ntp-4.2.4_p7-r1.ebuild 3782 RMD160 b07238f8198685f90e02bfbd84354fc2e0365dc6 SHA1 ca339df3e41933668b16e8a1f84e91c333395619 SHA256 53c26e8d0f2e1b8a8af8181931145cb124c5fff85962c7d116cd37f0edcbb3fe EBUILD ntp-4.2.4_p7.ebuild 3718 RMD160 1ef66c290349bea5dd58b95812a07e83ca0e67d4 SHA1 17689b7577b8ea10a2da04c643c2e4e81866723f SHA256 8bbcb2ac27d54f79b439656e13af20a5ad7a8f3c49257f64ab43cc0563470e12 EBUILD ntp-4.2.6.ebuild 3770 RMD160 60b69297e2a908529c0534fb6c7b294dfbd0bbf7 SHA1 91f7fc2a1d615a5d5bb86bc5e6638a10387fce09 SHA256 ab31f43f011c8b9ad49a5a68e8d44ce0008f9f2d077d5b0a9d286ebdf9da5874 -MISC ChangeLog 20989 RMD160 24ed13aa56f1feb4b522502f91d37236e4122471 SHA1 32657edf15523c7c01306c33f62bb5690966ea97 SHA256 42a91f915fc3dc0166608f997e39381fc60d6f3da8f7d6c99699823f397bd003 +MISC ChangeLog 21164 RMD160 b58417f0f768cda73ce26cd46770ffdc7fec1027 SHA1 2d7b3ea5fb2c219cd83e024dae855704ba947b32 SHA256 5682ab7ab0d216ba0ea0447d34074c3ca0787568fd0b0a431506eaf4ff9bde06 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAksmiH8ACgkQlPl3HsVfCDoe+wCaApoiZYQEkENUpQxORymZkRe+ -eCwAnAqEukKByIeUsAsWVDoiBqSobJRo -=bbWG +iEYEARECAAYFAksnho0ACgkQAiZjviIA2XhmnwCgmAMGdzND0UUkNzon6/GR0nQZ +hGYAmwVVzLRt2FhJbzygmvw05aipu2Hm +=Iu3i -----END PGP SIGNATURE----- diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch index 681029a1763c..8318e81f62ae 100644 --- a/net-misc/ntp/files/ntp-4.2.6-linking.patch +++ b/net-misc/ntp/files/ntp-4.2.6-linking.patch @@ -22,8 +22,8 @@ https://support.ntp.org/bugs/show_bug.cgi?id=1418 # LDADD might need RESLIB and ADJLIB -ntpdc_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \ - ../libntp/libntp.a -+ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \ -+ ../libntp/libntp.a @LCRYPTO@ ++ntpdc_LDADD = version.o $(LIBOPTS_LDADD) \ ++ ../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@ # ntpdc-layout doesn't need any additional libraries at all ntpdc_layout_LDADD = @@ -35,8 +35,8 @@ https://support.ntp.org/bugs/show_bug.cgi?id=1418 # LDADD might need RESLIB and ADJLIB -ntpq_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \ - ../libntp/libntp.a -+ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \ -+ ../libntp/libntp.a @LCRYPTO@ ++ntpq_LDADD = version.o $(LIBOPTS_LDADD) \ ++ ../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@ noinst_HEADERS = ntpq.h noinst_LIBRARIES = libntpq.a |