diff options
| -rw-r--r-- | net-misc/ntp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/ntp/Manifest | 15 | ||||
| -rw-r--r-- | net-misc/ntp/files/4.2.6-as-needed.patch | 45 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.6.ebuild | 7 |
4 files changed, 59 insertions, 15 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index 7d90803e8a13..a15805e7c347 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.154 2009/12/14 03:11:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.155 2009/12/14 18:39:13 scarabeus 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 + patch. *ntp-4.2.6 (14 Dec 2009) diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index a895b3a62deb..81ad454b1cc0 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 4.2.6-as-needed.patch 2078 RMD160 92854241197a5fe7a1742fc5b3f379e6ff4d7dce SHA1 e32d284d0b9614db4989a3963ec711429ccd414a SHA256 fb8dc6dcd2c15cffb69c146526c24c6a1ca693124c8f115e3a60019468ef5e5a 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 @@ -21,13 +19,6 @@ 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 3721 RMD160 a58bc620098893e61d74cc6aa16e889c481163b8 SHA1 fdba17aa78bb465b6148e6a987283890639e66f8 SHA256 c598cd3ff438ee87068e128a92cbb74c402d18ad7546f7778df68a39c042dff1 -MISC ChangeLog 20799 RMD160 6f2bdc1460a7baf63ed354f6b2a68bd441c31f00 SHA1 267742f39b9bfed69aa395199a04dd6d60c797f3 SHA256 a9bf0ca8706fc1e66f75ddc6486a4aa018cc4cfe0abb82abd46520f5ccf5b693 +EBUILD ntp-4.2.6.ebuild 3800 RMD160 743e748534f0d9dd48c05f19197cae2a09fc06ea SHA1 feea0a36a7929cba6e641b956d755bedd4bd5a3d SHA256 52e57afd564435013b62092d39c25b266bdd2ea21ed51e3b4b9751110f4c7891 +MISC ChangeLog 20992 RMD160 ec23008bad571adbc15fbaf2188ce59e9e69d5fc SHA1 da0a17544ebacc02c19afb0a04e2f1244e6f6afe SHA256 230f41a17d0ee2db1331e50d2a34d9c32c580e45427b008e40cb392ece120111 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) - -iEYEARECAAYFAkslrTMACgkQlPl3HsVfCDopiwCbBIOnuyC5jhVGvMFjZiK9gAFz -wQYAn1Hw6u2AHBUiQmk1UfU8RW2h8ZnV -=FOVu ------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 new file mode 100644 index 000000000000..aa45dec827e6 --- /dev/null +++ b/net-misc/ntp/files/4.2.6-as-needed.patch @@ -0,0 +1,45 @@ +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/ntp-4.2.6.ebuild b/net-misc/ntp/ntp-4.2.6.ebuild index a5b2a26cf7cd..dd624ba4915b 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.1 2009/12/14 03:11:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6.ebuild,v 1.2 2009/12/14 18:39:13 scarabeus Exp $ EAPI="2" -inherit eutils toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs flag-o-matic autotools MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -40,7 +40,10 @@ 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 append-cppflags -D_GNU_SOURCE #264109 + + eautoreconf } src_configure() { |