diff --git a/dhcp-4.1.1-P1.tar.bz2 b/dhcp-4.1.1-P1.tar.bz2 deleted file mode 100644 index ee5ee99..0000000 --- a/dhcp-4.1.1-P1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6041d1658d814bee5a863964c748dc2f79dd2c618ce9db716b2846177861282a -size 877572 diff --git a/dhcp-4.1.1-ldap-patch-mt-01.diff.bz2 b/dhcp-4.1.1-ldap-patch-mt-01.diff.bz2 deleted file mode 100644 index fd34c11..0000000 --- a/dhcp-4.1.1-ldap-patch-mt-01.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:176dec01acb2704866f516ed21b6210c9d16bd4667db9b265c57bb2b07735510 -size 46012 diff --git a/dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff b/dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff deleted file mode 100644 index 09dafb9..0000000 --- a/dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff +++ /dev/null @@ -1,57 +0,0 @@ -From 68249388d6974933059023eea4cf750688e8a11d Mon Sep 17 00:00:00 2001 -From: Marius Tomaschewski -Date: Tue, 27 Jul 2010 15:27:28 +0200 -Subject: [PATCH] Fixed ldap option numbers conflict - - -diff --git dhcp/includes/dhcpd.h dhcp/includes/dhcpd.h -index 6792497..95c2786 100644 ---- dhcp/includes/dhcpd.h -+++ dhcp/includes/dhcpd.h -@@ -677,25 +677,25 @@ struct lease_state { - #endif - - #if defined(LDAP_CONFIGURATION) --# define SV_LDAP_SERVER 57 --# define SV_LDAP_PORT 58 --# define SV_LDAP_USERNAME 59 --# define SV_LDAP_PASSWORD 60 --# define SV_LDAP_BASE_DN 61 --# define SV_LDAP_METHOD 62 --# define SV_LDAP_DEBUG_FILE 63 --# define SV_LDAP_DHCP_SERVER_CN 64 --# define SV_LDAP_REFERRALS 65 -+# define SV_LDAP_SERVER 60 -+# define SV_LDAP_PORT 61 -+# define SV_LDAP_USERNAME 62 -+# define SV_LDAP_PASSWORD 63 -+# define SV_LDAP_BASE_DN 64 -+# define SV_LDAP_METHOD 65 -+# define SV_LDAP_DEBUG_FILE 66 -+# define SV_LDAP_DHCP_SERVER_CN 67 -+# define SV_LDAP_REFERRALS 68 - #if defined (USE_SSL) --# define SV_LDAP_SSL 66 --# define SV_LDAP_TLS_REQCERT 67 --# define SV_LDAP_TLS_CA_FILE 68 --# define SV_LDAP_TLS_CA_DIR 69 --# define SV_LDAP_TLS_CERT 70 --# define SV_LDAP_TLS_KEY 71 --# define SV_LDAP_TLS_CRLCHECK 72 --# define SV_LDAP_TLS_CIPHERS 73 --# define SV_LDAP_TLS_RANDFILE 74 -+# define SV_LDAP_SSL 69 -+# define SV_LDAP_TLS_REQCERT 70 -+# define SV_LDAP_TLS_CA_FILE 71 -+# define SV_LDAP_TLS_CA_DIR 72 -+# define SV_LDAP_TLS_CERT 73 -+# define SV_LDAP_TLS_KEY 74 -+# define SV_LDAP_TLS_CRLCHECK 75 -+# define SV_LDAP_TLS_CIPHERS 76 -+# define SV_LDAP_TLS_RANDFILE 77 - #endif - #endif - --- -1.7.1 - diff --git a/dhcp-4.1.1-dhclient-send-hostname-rml.diff b/dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff similarity index 91% rename from dhcp-4.1.1-dhclient-send-hostname-rml.diff rename to dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff index 5d90ef0..6aca931 100644 --- a/dhcp-4.1.1-dhclient-send-hostname-rml.diff +++ b/dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff @@ -86,14 +86,15 @@ index 15c31a5..65e9c23 100644 /* Parse the lease database. */ read_client_leases(); -@@ -653,12 +690,12 @@ static void usage() +@@ -674,12 +711,12 @@ static void usage() log_error("Usage: dhclient %s %s", #ifdef DHCPv6 -- "[-4|-6] [-SNTP1dvrx] [-nw] [-p ]", -+ "[-4|-6] [-SNTP1dvrx] [-nw] [-H ] [-p ]", +- "[-4|-6] [-SNTP1dvrx] [-nw] [-p ] [-D LL|LLT]", ++ "[-4|-6] [-SNTP1dvrx] [-nw] [-H ] [-p ] [-D LL|LLT]", #else /* DHCPv6 */ - "[-1dvrx] [-nw] [-p ]", +- "[-1dvrx] [-nw] [-p ]", ++ "[-1dvrx] [-nw] [-H ] [-p ]", #endif /* DHCPv6 */ "[-s server]"); - log_error(" [-cf config-file] [-lf lease-file]%s", diff --git a/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 b/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 new file mode 100644 index 0000000..d5d9410 --- /dev/null +++ b/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e58b92113ba2502a7f3957065dac709d8d7e8fe3e23bc3e2543cec0a2c11450 +size 9915 diff --git a/dhcp-4.2.0-P1-no-libcrypto.diff b/dhcp-4.2.0-P1-no-libcrypto.diff new file mode 100644 index 0000000..2ee2481 --- /dev/null +++ b/dhcp-4.2.0-P1-no-libcrypto.diff @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index b880616..3e0d11b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -420,8 +420,12 @@ AC_TRY_LINK( + AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) + + # find an MD5 library ++saved_LIBS="$LIBS" ++LIBS="" + AC_SEARCH_LIBS(MD5_Init, [crypto]) + AC_SEARCH_LIBS(MD5Init, [crypto]) ++CRYPTO_LIBS="$LIBS" ++LIBS="$saved_LIBS" + + # Solaris needs some libraries for functions + AC_SEARCH_LIBS(socket, [socket]) diff --git a/dhcp-4.2.0-P1.tar.bz2 b/dhcp-4.2.0-P1.tar.bz2 new file mode 100644 index 0000000..09fcc3b --- /dev/null +++ b/dhcp-4.2.0-P1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4249504f17f1696f0d8ec9b975f193564f460e50c58c631e560dce130aadfe2 +size 8434029 diff --git a/dhcp.changes b/dhcp.changes index 6ac32ac..dd673a8 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 26 14:54:43 UTC 2010 - mt@suse.de + +- FIXME: update to 4.2.0-P1 + ------------------------------------------------------------------- Tue Nov 2 09:48:56 UTC 2010 - mt@suse.de diff --git a/dhcp.spec b/dhcp.spec index 1758f94..ca411f4 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,5 +1,5 @@ # -# spec file for package dhcp (Version 4.1.1.P1) +# spec file for package dhcp (Version 4.2.0.P1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define isc_version 4.1.1-P1 +%define isc_version 4.2.0-P1 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d @@ -32,13 +32,11 @@ BuildRequires: dos2unix License: BSD3c(or similar) Group: Productivity/Networking/Boot/Servers AutoReqProv: on -Version: 4.1.1.P1 -Release: 6 +Version: 4.2.0.P1 +Release: 0 Summary: Common Files Used by ISC DHCP Software Url: http://www.isc.org/software/dhcp Source0: dhcp-%{isc_version}.tar.bz2 -#Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz -#Source1: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz.asc # Source10: rc.dhcpd Source11: rc.dhcpd6 @@ -75,14 +73,10 @@ Patch13: dhcp-4.1.1-tmpfile.diff Patch14: dhcp-4.1.1-in6_pktinfo-prototype.diff Patch15: contrib-lease-path.diff Patch20: dhcp-4.1.1-dhclient-exec-filedes.diff -Patch21: dhcp-4.1.1-dhclient-send-hostname-rml.diff +Patch21: dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff ## patch lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/ -%if 0%{?with_ldap:1} -Patch30: dhcp-4.1.1-ldap-patch-mt-01.diff.bz2 -Patch31: dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff -%else -Patch30: dhcp-4.1.1-dhclient-no-libcrypto.diff -%endif +Patch30: dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 +Patch39: dhcp-4.2.0-P1-no-libcrypto.diff Patch40: dhcp-4.1.1-P1-lpf-bind-msg-fix.diff Patch41: dhcp-4.1.1-P1-relay-no-ip-on-interface.diff Patch42: dhcp-4.1.1-P1-optional-value-infinite-loop.diff @@ -204,12 +198,10 @@ Authors: %patch15 -p0 %patch20 -p1 %patch21 -p1 -%if 0%{?with_ldap:%with_ldap} -%patch30 -p1 -%patch31 -p1 -%else +%if 0%{?with_ldap:1} %patch30 -p1 %endif +%patch39 -p1 %patch40 -p1 %patch41 -p1 %patch42 -p1 @@ -245,8 +237,9 @@ autoreconf --enable-paranoia \ --enable-early-chroot \ %if 0%{?with_ldap:%with_ldap} - --enable-ldap-conf \ - --enable-ldap-casa \ + --with-ldap \ + --with-ldapcrypto \ + --with-ldapcasa \ %endif --with-cli-pid-file=%{_localstatedir}/run/dhclient.pid \ --with-cli-lease-file=%{_localstatedir}/lib/dhcp/dhclient.leases \ @@ -280,7 +273,9 @@ install -d -m0755 $RPM_BUILD_ROOT/sbin install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d install -d -m0755 $RPM_BUILD_ROOT/%{susefw2dir} install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir} +%if 0%{?with_ldap:%with_ldap} install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema +%endif install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates # chroot jail @@ -326,8 +321,10 @@ install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \ $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ # another config files and scripts -install -m0644 contrib/dhcp.schema \ +%if 0%{?with_ldap:%with_ldap} +install -m0644 contrib/ldap/dhcp.schema \ $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema +%endif install -m0644 $RPM_SOURCE_DIR/dhcpd.xml \ $RPM_SOURCE_DIR/dhcpd6.xml \ $RPM_BUILD_ROOT/%{omc_svcdir}/ @@ -349,11 +346,6 @@ install -m0644 $RPM_SOURCE_DIR/DDNS-howto.txt . cp doc/examples/* ./examples/ rm -f doc/{References.xml,Makefile*} rm -f contrib/dhcp.spec -%if ! 0%{?with_ldap:%with_ldap} -rm -f doc/draft-ietf-dhc-ldap-schema-01.txt -rm -f contrib/dhcp.schema README.ldap -rm -f contrib/dhcpd-conf-to-ldap.pl -%endif %pre server /usr/sbin/useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d /var/lib/dhcp dhcpd 2> /dev/null ||: @@ -450,7 +442,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %doc %{_mandir}/man8/dhcpd.8.gz %doc %{_mandir}/man5/dhcpd.conf.5.gz %doc %{_mandir}/man5/dhcpd.leases.5.gz -%if 0%{?with_ldap:1} +%if 0%{?with_ldap:%with_ldap} %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0644, root, root) %config %{_sysconfdir}/openldap/schema/dhcp.schema