diff options
| -rw-r--r-- | net-misc/ntp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/ntp/Manifest | 16 | ||||
| -rw-r--r-- | net-misc/ntp/files/4.2.6-as-needed.patch | 45 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.6-linking.patch | 42 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.6.ebuild | 8 |
5 files changed, 61 insertions, 56 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index a15805e7c347..bcf6e50a89f9 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,10 +1,10 @@ # 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.155 2009/12/14 18:39:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.156 2009/12/14 18:47:09 vapier Exp $ 14 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> - +files/4.2.6-as-needed.patch, ntp-4.2.6.ebuild: - QA: Apply as-needed fix per bug #296832. Thanks to Martin von Gagern for + +files/ntp-4.2.6-as-needed.patch, ntp-4.2.6.ebuild: + Apply as-needed fix per bug #296832. Thanks to Martin von Gagern for patch. *ntp-4.2.6 (14 Dec 2009) diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 81ad454b1cc0..1d5a674f22b8 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,10 +1,13 @@ -AUX 4.2.6-as-needed.patch 2078 RMD160 92854241197a5fe7a1742fc5b3f379e6ff4d7dce SHA1 e32d284d0b9614db4989a3963ec711429ccd414a SHA256 fb8dc6dcd2c15cffb69c146526c24c6a1ca693124c8f115e3a60019468ef5e5a +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX man-pages/genmans.sh 1763 RMD160 beae31c2699764654add4afd184d927bae3fbc44 SHA1 ccd655f5422715ba0513bfe14b6f5bf2f5a658c8 SHA256 4717e348b3b31d5b648a76cf4e81b81c5a69443a8b2ea26247c42354a6b6e57c AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d AUX man-pages/ntpdc.html.patch 1620 RMD160 0d240cb9b547b7a056b4f08a93385f5c1f4dca6a SHA1 64376272f02c9027d3715b97ab88816b73f0b618 SHA256 3b7295dba123c9922c1e375228f82707582ffa0add0177ad000a123df3852578 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-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 @@ -19,6 +22,13 @@ DIST ntp-4.2.6.tar.gz 4322055 RMD160 2258b2c624559aa5f8ae0ead164059064d341332 SH EBUILD ntp-4.2.4_p6.ebuild 4135 RMD160 15cec7d894f3a013d330c81ec72e7d920311f9c4 SHA1 453dff9e9ef1bd4d3e58ba9d98caa243b02ff1bd SHA256 460e8ca13c724f4d105209d2fe7f9a84e825c08ce36b031c81de2360e6ff4265 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 3800 RMD160 743e748534f0d9dd48c05f19197cae2a09fc06ea SHA1 feea0a36a7929cba6e641b956d755bedd4bd5a3d SHA256 52e57afd564435013b62092d39c25b266bdd2ea21ed51e3b4b9751110f4c7891 -MISC ChangeLog 20992 RMD160 ec23008bad571adbc15fbaf2188ce59e9e69d5fc SHA1 da0a17544ebacc02c19afb0a04e2f1244e6f6afe SHA256 230f41a17d0ee2db1331e50d2a34d9c32c580e45427b008e40cb392ece120111 +EBUILD ntp-4.2.6.ebuild 3770 RMD160 60b69297e2a908529c0534fb6c7b294dfbd0bbf7 SHA1 91f7fc2a1d615a5d5bb86bc5e6638a10387fce09 SHA256 ab31f43f011c8b9ad49a5a68e8d44ce0008f9f2d077d5b0a9d286ebdf9da5874 +MISC ChangeLog 20989 RMD160 24ed13aa56f1feb4b522502f91d37236e4122471 SHA1 32657edf15523c7c01306c33f62bb5690966ea97 SHA256 42a91f915fc3dc0166608f997e39381fc60d6f3da8f7d6c99699823f397bd003 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAksmiH8ACgkQlPl3HsVfCDoe+wCaApoiZYQEkENUpQxORymZkRe+ +eCwAnAqEukKByIeUsAsWVDoiBqSobJRo +=bbWG +-----END PGP SIGNATURE----- diff --git a/net-misc/ntp/files/4.2.6-as-needed.patch b/net-misc/ntp/files/4.2.6-as-needed.patch deleted file mode 100644 index aa45dec827e6..000000000000 --- a/net-misc/ntp/files/4.2.6-as-needed.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: ntp-4.2.6/ntpd/Makefile.am -=================================================================== ---- ntp-4.2.6.orig/ntpd/Makefile.am -+++ ntp-4.2.6/ntpd/Makefile.am -@@ -83,8 +83,8 @@ man_MANS= ntpd.1 - # floor refclock_wwv.o - # which are (usually) provided by -lm. - keyword_gen_LDADD = ../libntp/libntp.a --ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a --ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a -+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@ -+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@ - ntpdsim_CFLAGS = $(CFLAGS) -DSIM - check_y2k_LDADD = $(LDADD) ../libntp/libntp.a - DISTCLEANFILES = keyword-gen .version version.c -Index: ntp-4.2.6/ntpdc/Makefile.am -=================================================================== ---- ntp-4.2.6.orig/ntpdc/Makefile.am -+++ ntp-4.2.6/ntpdc/Makefile.am -@@ -10,8 +10,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$ - -I$(top_srcdir)/lib/isc/nothreads/include \ - -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS) - # 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-layout doesn't need any additional libraries at all - ntpdc_layout_LDADD= - DISTCLEANFILES= .version version.c -Index: ntp-4.2.6/ntpq/Makefile.am -=================================================================== ---- ntp-4.2.6.orig/ntpq/Makefile.am -+++ ntp-4.2.6/ntpq/Makefile.am -@@ -8,8 +8,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$ - -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS) - - # 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@ - noinst_HEADERS= ntpq.h - noinst_LIBRARIES= libntpq.a - # HMS: I don't think we need libntpq_a_LIBADD... diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch new file mode 100644 index 000000000000..681029a1763c --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.6-linking.patch @@ -0,0 +1,42 @@ +http://bugs.gentoo.org/296832 +https://support.ntp.org/bugs/show_bug.cgi?id=1418 + +--- ntp-4.2.6/ntpd/Makefile.in ++++ ntp-4.2.6/ntpd/Makefile.in +@@ -358,8 +358,8 @@ man_MANS = ntpd.1 + # floor refclock_wwv.o + # which are (usually) provided by -lm. + keyword_gen_LDADD = ../libntp/libntp.a +-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a +-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a ++ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@ ++ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@ + ntpdsim_CFLAGS = $(CFLAGS) -DSIM + check_y2k_LDADD = $(LDADD) ../libntp/libntp.a + DISTCLEANFILES = keyword-gen .version version.c +--- ntp-4.2.6/ntpdc/Makefile.in ++++ ntp-4.2.6/ntpdc/Makefile.in +@@ -264,8 +264,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I + -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS) + + # 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-layout doesn't need any additional libraries at all + ntpdc_layout_LDADD = +--- ntp-4.2.6/ntpq/Makefile.in ++++ ntp-4.2.6/ntpq/Makefile.in +@@ -265,8 +265,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I + + + # 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@ + + noinst_HEADERS = ntpq.h + noinst_LIBRARIES = libntpq.a diff --git a/net-misc/ntp/ntp-4.2.6.ebuild b/net-misc/ntp/ntp-4.2.6.ebuild index dd624ba4915b..ea008a2ff5c3 100644 --- a/net-misc/ntp/ntp-4.2.6.ebuild +++ b/net-misc/ntp/ntp-4.2.6.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6.ebuild,v 1.2 2009/12/14 18:39:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6.ebuild,v 1.3 2009/12/14 18:47:09 vapier Exp $ EAPI="2" -inherit eutils toolchain-funcs flag-o-matic autotools +inherit eutils toolchain-funcs flag-o-matic MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -40,10 +40,8 @@ src_prepare() { #epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - epatch "${FILESDIR}"/${PV}-as-needed.patch #296832 + epatch "${FILESDIR}"/${P}-linking.patch #296832 append-cppflags -D_GNU_SOURCE #264109 - - eautoreconf } src_configure() { |