dbp/mds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net-misc/dhcp: correct ebuild patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1349 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-07-08 17:32:17 +00:00
parent 477146c890
commit dae78c41f9
4 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net-misc/dhcp/ChangeLog
View File

@ -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 $
08 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
files/dhcp-3.1.2.ebuild.patch, files/dhcp-4.0.1.ebuild.patch:
correct ebuild patch
08 Jul 2009; Mario Fetka <mario.fetka@gmail.com> dhcp-3.1.2.ebuild,
dhcp-4.0.1.ebuild:
correct the ldap patch

6
net-misc/dhcp/Manifest
View File

@ -13,7 +13,7 @@ AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df
AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
AUX dhcp-3.1.2.ebuild.patch 3160 RMD160 60a08fa901e2341eac6a164cab67ea78b6b36dfc SHA1 5fc4c5840e1713010f6d39005583280c37e7d195 SHA256 7963a82c14eef6f423eae9cd24bbce0797cf8fbf5b278f8704288b203fdb8a14
AUX dhcp-3.1.2.ebuild.patch 3117 RMD160 7554c09de35d67cce5c261e8ea09ca4a3d9eb40c SHA1 6f7f4cdc2aeb018565210c3aa6c71e8006cfc34c SHA256 d0aa621fb1cd15fecdd2201fe50eedb3dc6c1403adba1949c19d81ff1a80c43c
AUX dhcp-4.0-dhclient-metric.patch 8100 RMD160 cd599d5523be30809024b8e0f81cd84e4d932317 SHA1 ba9ff19cc5274b0e3e8408eba4725e0546413954 SHA256 a1c5589ac1c57ba7fe66336646f4286ebd7112f05abf5ae59b69ff26e7409afc
AUX dhcp-4.0-dhclient-ntp.patch 7966 RMD160 d6dd1c3363f06712a82231eae1eb559f5a45bbb5 SHA1 3c1b373c6649c1ccb44f205fbee116c134514f4e SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b
AUX dhcp-4.0-dhclient-resolvconf.patch 14516 RMD160 0a53cbb795c4d4989f5632b6314b69be5bd94611 SHA1 e1db8ecca4de1c45fcec7e93fb13d186931d74f6 SHA256 1cdbb9ed297426b2d44063ffb8642c9c5cdf54dc2f9c3c8f59100f4ab2c40986
@ -22,7 +22,7 @@ AUX dhcp-4.0-linux-ipv6-header.patch 817 RMD160 cd395ba33c6e729862af7a3c869d412e
AUX dhcp-4.0-no_isc_blurb.patch 2748 RMD160 f29d8705fab63320c18c6319dd5703a51acc1687 SHA1 d8af8f4567e4bdbfac5d8e5455dede87a188ad40 SHA256 603e9a6f28264e35513f40f987d10e4fdce6d5e4f8d48aa46f83b8687d57dff0
AUX dhcp-4.0-paranoia.patch 4996 RMD160 2f8339e3d8af9164c91cc5a3bab7605ecd728295 SHA1 94db8a07b82b69d0a05645b08ef5d0ec0b99bd19 SHA256 14d328d400cdc1b4d7d6329d9c8e997b2c5e76e8f21330e267a75d6240799058
AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd04a2e6055613a SHA1 f4a9d51126ea489f75fcf29053ab432b68e5055d SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c
AUX dhcp-4.0.1.ebuild.patch 2610 RMD160 4e6352ffb84cf3f4c139d7dc7e0925a2270a098d SHA1 518a332ce18a5016c6bb7b5317e40ae24abf1acf SHA256 9742bba6f54ae34a8a7cc737ab2376734f7f922bc7b839f3ee263ae11752d73a
AUX dhcp-4.0.1.ebuild.patch 2594 RMD160 2a07162a5a9b9c3373d409a9bf0a05e9ae97d23f SHA1 edd8ab5fb8f0af1082395df492397485883a22e1 SHA256 95b4847217b05389ae245eb95d059431e7e4ba068f2911e1c6e531912c03a48b
AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
@ -33,5 +33,5 @@ DIST ldap-for-dhcp-3.1.2-1.1.tar.gz 39022 RMD160 389dfddc2a599f799a4d2d1f6659013
DIST ldap-for-dhcp-4.0.1-2.1.tar.gz 38676 RMD160 0afe265b939e15d352c998514c8a1a8fba2c247e SHA1 0487b2194bb2841e2bb50e8a88c37f8e7b06390f SHA256 3c155cd22cfa1cfbab2867bb329d306eb3b23c9fcc306e00a70c003ee27031ae
EBUILD dhcp-3.1.2.ebuild 8400 RMD160 faa8d8e8d792dd5c3a187a3185ca109827170f83 SHA1 3b7683cee5da98186dc8d87064471b30ea5dbc61 SHA256 1d3df03c3c291987041651e25965140e1133be6bc6e0171a771bd8dce4403d9e
EBUILD dhcp-4.0.1.ebuild 7515 RMD160 1b163148e52c5dcc6353476687ddf99726ea7407 SHA1 ea32dd0ad60be0a000c774750d42d3a517f7addb SHA256 2ef83f7642d97ffe4f8657922355d20ea96802bc756cd6fb4fb767448d5ab9a6
MISC ChangeLog 27992 RMD160 e8b10d8562f64446e9e4f047e032e19d0a860fdd SHA1 3c831a348117e1a530d34c03bfc8afc8c339c616 SHA256 55f69b041c7f0f66da7cb2ed0250b09d9434c2a4b7715cae855b479a553d36f9
MISC ChangeLog 28131 RMD160 aa1a79e5d07e1d30fcf6c58f83d0a1587cd42b36 SHA1 8fffbf627f8396b65dc113d63481c28199376694 SHA256 b8cf7d69d2cf8685954bb5ffca3338f9a2bc2eb84b30bc8f628d5fc495655745
MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415

33
net-misc/dhcp/files/dhcp-3.1.2.ebuild.patch
View File

@ -1,5 +1,5 @@
--- /usr/portage/net-misc/dhcp/dhcp-3.1.1.ebuild 2009-04-05 12:37:41.000000000 +0200
+++ dhcp-3.1.2.ebuild 2009-07-07 22:01:04.968912251 +0200
+++ dhcp-3.1.2.ebuild 2009-07-08 19:11:03.383208313 +0200
@@ -1,24 +1,31 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
@ -8,7 +8,7 @@
inherit eutils flag-o-matic multilib toolchain-funcs
+LDAP_PV="3.1.2-1"
+LDAP_PV="3.1.2-1.1"
+
MY_PV="${PV//_alpha/a}"
MY_PV="${MY_PV//_beta/b}"
@ -19,8 +19,8 @@
HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz
+ http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz"
+ ldap? ( http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz
+ http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz )"
LICENSE="isc-dhcp"
SLOT="0"
@ -46,45 +46,48 @@
# Brand the version with Gentoo
# include revision if >0
local newver="${MY_PV}-Gentoo"
@@ -119,6 +129,8 @@
@@ -119,6 +129,10 @@
#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)
@@ -138,6 +150,8 @@
@@ -138,6 +152,10 @@
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"
@@ -152,7 +166,11 @@
@@ -152,7 +170,10 @@
src_install() {
make install DESTDIR="${D}" || die
- use doc && dodoc README RELNOTES doc/*
+ 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
@@ -167,6 +185,13 @@
@@ -167,6 +188,13 @@
newconfd "${FILESDIR}"/dhcpd.conf dhcpd
newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ # 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
+

20
net-misc/dhcp/files/dhcp-4.0.1.ebuild.patch
View File

@ -1,10 +1,10 @@
--- /usr/portage/net-misc/dhcp/dhcp-4.0.1.ebuild 2009-03-30 15:13:28.000000000 +0200
+++ dhcp-4.0.1.ebuild 2009-07-07 21:58:00.179625641 +0200
@@ -4,22 +4,29 @@
+++ dhcp-4.0.1.ebuild 2009-07-08 19:11:15.121631116 +0200
@@ -4,22 +4,30 @@
inherit eutils flag-o-matic autotools
+LDAP_PV="4.0.1-1"
+LDAP_PV="4.0.1-2.1"
+
MY_PV="${PV//_alpha/a}"
MY_PV="${MY_PV//_beta/b}"
@ -16,7 +16,8 @@
HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz"
+ ldap? ( http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz
+ http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz )"
LICENSE="isc-dhcp"
SLOT="0"
@ -33,7 +34,7 @@
PROVIDE="virtual/dhcpc"
@@ -65,6 +72,9 @@
@@ -65,6 +73,9 @@
# Add dbus support to dhclient
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
@ -43,7 +44,7 @@
# Brand the version with Gentoo
# include revision if >0
local newver="Gentoo"
@@ -114,6 +124,8 @@
@@ -114,6 +125,8 @@
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
$(use_enable ipv6 dhcpv6) \
@ -52,7 +53,7 @@
|| die
emake || die "compile problem"
@@ -138,8 +150,11 @@
@@ -138,8 +151,10 @@
newexe "${S}"/client/scripts/freebsd dhclient-script
fi
@ -60,8 +61,7 @@
-
+ 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
@ -73,7 +73,7 @@
+ # 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
+