From a4599cfcd0eac2903f0c18468f03fcb20a76ad98 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 7 Jul 2009 20:35:05 +0000 Subject: [PATCH] net-misc/dhcp: second try for ldap ssl relation dependencies git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1333 6952d904-891a-0410-993b-d76249ca496b --- net-misc/dhcp/ChangeLog | 4 ++++ net-misc/dhcp/Manifest | 6 +++--- net-misc/dhcp/dhcp-3.1.2.ebuild | 17 ++++++++++------- net-misc/dhcp/dhcp-4.0.1.ebuild | 5 ++--- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 20f8813..ff6383a 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.154 2009/05/29 23:30:28 vapier Exp $ + 07 Jul 2009; Mario Fetka dhcp-3.1.2.ebuild, + dhcp-4.0.1.ebuild: + second try for ldap ssl relation dependencies + 07 Jul 2009; Mario Fetka +files/dhcp-3.1.0a1-dhclient-resolvconf.patch, dhcp-3.1.2.ebuild, +files/dhcp-3.1.2.ebuild.patch, dhcp-4.0.1.ebuild, diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 9b44b01..c5f1b3a 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -31,7 +31,7 @@ DIST dhcp-3.1.2.tar.gz 799626 RMD160 026ac48b176ec273397fafa8a834a21fd6331681 SH DIST dhcp-4.0.1.tar.gz 1050570 RMD160 a9764a76d105778362fe4b58e77783331ee3448a SHA1 7d813740ab4a64e474f1c01b1395617987532ed1 SHA256 965d09a7759250eff7d6d06d37425ea085c14edb5b405f8357ef5ec72ded28ef DIST ldap-for-dhcp-3.1.2-1.tar.gz 41453 RMD160 d6b7401fa9d60937a2d0cb8c225c39016cc02a65 SHA1 39087b2102f901b19c8bf1373db2b47bd5b2d630 SHA256 540cfdfe081114d4cbc092e4532a506f2234d890fde9007c9c23017709298096 DIST ldap-for-dhcp-4.0.1-1.tar.gz 39164 RMD160 451edcf646e56cfbaec18303e9ad6f36e36f1e38 SHA1 19a4b7e5a33d298ec6948554623fdf96016f681f SHA256 0a2bc6d28f6c9f7b081ff1f832e8411d846a17e96b0493459f4ec9ab87a2ed36 -EBUILD dhcp-3.1.2.ebuild 8448 RMD160 75b66c12dee99d1daaaa875613081922fa1c7ccf SHA1 ec4c7236c25d2b32c0f974e80c9b56b3077fee9f SHA256 eeadbb97103849797708e46cf93be7994b76f33dfaa79d4ed0207b63f5100af1 -EBUILD dhcp-4.0.1.ebuild 7531 RMD160 2d142ce9650c1f423d88a602b0a82760d41ff1ea SHA1 73041547bfbbc983998e718226db1ea30d0bd488 SHA256 7947f4c7a2d533c22be45d392701257c358aa436d2de6c1aefea554a9881f60d -MISC ChangeLog 27507 RMD160 ac1d6f149ad867d31cd62b916cfbaa5e80f36e9b SHA1 2523dead0f78ca02fac3033b0edb28d65fd79801 SHA256 6d8ec0b22c79efd39758804784be73208928f154da1979f21e1426b1730672f9 +EBUILD dhcp-3.1.2.ebuild 8386 RMD160 3e29935735686de966aa770ff8e8f6e6e835ca4f SHA1 40dd1043730e942ca22ccf90417b0ae82448fb69 SHA256 60336af42b77d11c87e1b7a7d1ffb0ccd6a8f28ea22f9880219a7a262d69b521 +EBUILD dhcp-4.0.1.ebuild 7441 RMD160 56326fc2255a729f494c1cca8eb8622b5cceac2a SHA1 54eafa023174e32dc4a6d9444e3b639e408d8654 SHA256 3a896e003613c59bce41aa99abeae48b393d82042e022c12e5c5f28c567b5a87 +MISC ChangeLog 27647 RMD160 d4f15a57b14667a7bc6bd099b6b63802b1a7995f SHA1 4c30e4ce450c122f67a9f6084ba2b66a613c57be SHA256 c424703d57d5e63f4b931ffc51a06ddf0749cdfd9923d09276a45880a6830014 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415 diff --git a/net-misc/dhcp/dhcp-3.1.2.ebuild b/net-misc/dhcp/dhcp-3.1.2.ebuild index f71db67..66b7775 100644 --- a/net-misc/dhcp/dhcp-3.1.2.ebuild +++ b/net-misc/dhcp/dhcp-3.1.2.ebuild @@ -129,8 +129,10 @@ src_compile() { #define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid" #define DHCPD_LOG_FACILITY LOG_LOCAL1 END - use ldap && echo "#define LDAP_CONFIGURATION" >> includes/site.h - use ssl && echo "#define USE_SSL" >> includes/site.h + if use ldap ; then + echo "#define LDAP_CONFIGURATION" >> includes/site.h + use ssl && echo "#define USE_SSL" >> includes/site.h + fi cat <<-END > site.conf CC = $(tc-getCC) @@ -150,8 +152,10 @@ src_compile() { USRMANEXT = .1 MANCAT = man END - use ldap && echo "LDAPLIB = -lldap" >> site.conf - use ssl && echo "SSLLIB = -lcrypto -lssl" >> site.conf + if use ldap ; then + echo "LDAPLIB = -lldap" >> site.conf + use ssl && echo "SSLLIB = -lcrypto -lssl" >> site.conf + fi ./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \ || die "configure failed" @@ -168,8 +172,7 @@ src_install() { make install DESTDIR="${D}" || die if use doc; then dodoc README RELNOTES doc/* - use ldap && dodoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/README.ldap "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/draft-ietf-dhc-ldap-schema-01.txt - use ldap && newdoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/LICENSE LICENSE.ldap + use ldap && dodoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/*.ldap "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/draft-ietf-dhc-ldap-schema-01.txt fi insinto /etc/dhcp @@ -188,7 +191,7 @@ src_install() { # install ldap files if use ldap; then insinto /etc/openldap/schema - doins "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcp.schema + doins "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcp.* dosbin "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcpd-conf-to-ldap fi diff --git a/net-misc/dhcp/dhcp-4.0.1.ebuild b/net-misc/dhcp/dhcp-4.0.1.ebuild index 056b034..e5f9668 100644 --- a/net-misc/dhcp/dhcp-4.0.1.ebuild +++ b/net-misc/dhcp/dhcp-4.0.1.ebuild @@ -152,8 +152,7 @@ src_install() { if use doc; then dodoc README RELNOTES doc/* - use ldap && dodoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/README.ldap "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/draft-ietf-dhc-ldap-schema-01.txt - use ldap && newdoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/LICENSE LICENSE.ldap + use ldap && dodoc "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/*.ldap "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/draft-ietf-dhc-ldap-schema-01.txt fi insinto /etc/dhcp newins client/dhclient.conf dhclient.conf.sample @@ -170,7 +169,7 @@ src_install() { # install ldap files if use ldap; then insinto /etc/openldap/schema - doins "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcp.schema + doins "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcp.* dosbin "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}"/dhcpd-conf-to-ldap fi