From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 20 Sep 2012 05:45:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=e0027e6cdc8fb4b7849430aa805a0314fef2b6a7

Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
	config/rootfiles/core/52/meta
	config/rootfiles/core/53/filelists/strongswan
	config/rootfiles/core/53/meta
	config/rootfiles/core/54/filelists/strongswan
	config/rootfiles/core/54/meta
	config/rootfiles/core/55/exclude
	config/rootfiles/core/55/meta
	config/rootfiles/core/56/exclude
	config/rootfiles/core/56/meta
	config/rootfiles/core/57/exclude
	config/rootfiles/core/57/filelists/strongswan
	config/rootfiles/core/57/meta
	config/rootfiles/core/58/exclude
	config/rootfiles/core/58/filelists/strongswan
	config/rootfiles/core/58/meta
	config/rootfiles/core/59/exclude
	config/rootfiles/core/59/filelists/strongswan
	config/rootfiles/core/59/meta
	config/rootfiles/core/strongswan/exclude
	config/rootfiles/core/strongswan/filelists/strongswan
	config/rootfiles/core/strongswan/meta
	config/rootfiles/oldcore/52/meta
	config/rootfiles/oldcore/53/filelists/strongswan
	config/rootfiles/oldcore/53/meta
	config/rootfiles/oldcore/54/filelists/strongswan
	config/rootfiles/oldcore/54/meta
	config/rootfiles/oldcore/55/exclude
	config/rootfiles/oldcore/55/meta
	config/rootfiles/oldcore/56/exclude
	config/rootfiles/oldcore/56/meta
	config/rootfiles/oldcore/57/exclude
	config/rootfiles/oldcore/57/filelists/strongswan
	config/rootfiles/oldcore/57/meta
	config/rootfiles/oldcore/58/exclude
	config/rootfiles/oldcore/58/filelists/strongswan
	config/rootfiles/oldcore/58/meta
	config/rootfiles/oldcore/59/exclude
	config/rootfiles/oldcore/59/filelists/strongswan
	config/rootfiles/oldcore/59/meta
	lfs/dhcp
---

e0027e6cdc8fb4b7849430aa805a0314fef2b6a7
diff --cc lfs/dhcp
index 235e82596,fa26b5cfb..317eef4ed
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@@ -70,11 -70,59 +70,63 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
++
 +	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-3.1_linux3.patch
- 	cd $(DIR_APP) && ./configure
++
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-remove-bind.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-errwarn-message.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-options.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-release-by-ifup.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-unicast-bootp.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-dhclient-usage.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-default-requested-options.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-xen-checksum.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-manpages.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-paths.patch
 -	# Has to be enabled after glibc update.
 -	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-CLOEXEC.patch
++	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-CLOEXEC.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-inherit-leases.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-garbage-chars.patch
 -	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
++	# ???
++	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-capability.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-logpid.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-UseMulticast.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-sendDecline.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-retransmission.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-honor-expired.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-noprefixavail.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-sharedlib.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-PPP.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-lpf-ib.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-improved-xid.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-gpxe-cid.patch
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
+ 
+ 	# Remove bundled BIND stuff.
+ 	# (requires newer autoconf)
+ 	#rm -rfv $(DIR_APP)/bind/bind.tar.gz
+ 	#cd $(DIR_APP) && autoreconf --verbose --force --install
+ 
+ 	cd $(DIR_APP) && \
+ 		./configure \
+ 			--prefix=/usr \
+ 			--sysconfdir=/etc \
+ 			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
+ 			--disable-static \
+ 			--enable-paranoia \
+ 			--enable-early-chroot \
+ 			--disable-dhcpv6
++
  	cd $(DIR_APP) && make $(MAKETUNING)
- 	cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
+ 	cd $(DIR_APP) && make install
+ 
+ 	mkdir -pv /var/state/dhcp
  	touch /var/state/dhcp/dhcpd.leases
+ 
  	ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
  	@rm -rf $(DIR_APP)
  	@$(POSTBUILD)
diff --cc make.sh
index 1e08be6d3,576e9970f..0e0192c80
--- a/make.sh
+++ b/make.sh
@@@ -758,8 -770,8 +758,9 @@@ buildipfire() 
    ipfiremake mtr
    ipfiremake tcpick
    ipfiremake minidlna
 +  ipfiremake acpid
    ipfiremake fping
+   ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild