diff --git a/dhcp.spec b/dhcp.spec index 72d6a70..1769192 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -342,399 +342,20 @@ rm -rf %{_var}/lib/dhclient/dhclient.leases %changelog -* Thu Mar 28 2013 oden 3:4.2.5P1-1.mga3 -+ Revision: 405980 +* Wed Jul 31 2013 akdengi - P103: rediff - 4.2.5-P1 (fixes CVE-2013-2494) - drop bogus br on bind-devel -- Make sure ldap service is started before dhcpd (neoclust) - -* Sun Mar 24 2013 colin 3:4.2.4P2-5.mga3 -+ Revision: 405136 -- Use tmpfiles macros and add system version to requires (mga#9302) - -* Fri Jan 11 2013 umeabot 3:4.2.4P2-4.mga3 -+ Revision: 348757 -- Mass Rebuild - https://wiki.mageia.org/en/Feature:Mageia3MassRebuild - -* Wed Dec 26 2012 guillomovitch 3:4.2.4P2-3.mga3 -+ Revision: 335360 +- Make sure ldap service is started before dhcpd +- Use tmpfiles macros and add system version to requires - add fedora patch adding requesting more options by default - -* Mon Dec 17 2012 guillomovitch 3:4.2.4P2-2.mga3 -+ Revision: 332185 - drop static libs - use /run instead of /var/run for pid files - switch to tmpfs for /run subdirectories - use distinct state directories for client and server, as in fedora - -* Thu Sep 13 2012 luigiwalser 3:4.2.4P2-1.mga3 -+ Revision: 293669 -- 4.2.4-P2 (fixes CVE-2012-3955) - -* Tue Jul 31 2012 guillomovitch 3:4.2.4P1-1.mga3 -+ Revision: 276555 - drop sysinit support -- new version - -* Sat Apr 28 2012 tmb 3:4.2.3P2-6.mga2 -+ Revision: 233666 -- Require rpm-helper >= 0.24.8-1 for systemd support -- rebuild for versioned rpm-helper requires - -* Wed Mar 14 2012 stewb 3:4.2.3P2-4.mga2 -+ Revision: 223343 -- Get rid of mandrakesoft in dhcpd.conf (mageia bug #3353) - -* Mon Mar 12 2012 colin 3:4.2.3P2-3.mga2 -+ Revision: 223169 -- Fix systemd units to report correct status on startup (mga#4892) - -* Tue Jan 31 2012 dmorgan 3:4.2.3P2-2.mga2 -+ Revision: 203651 +- Fix systemd units to report correct status on startup - Add dhcpd user - Fix service files extension -* Sun Jan 15 2012 fwang 3:4.2.3_P2-1.mga2 -+ Revision: 196496 -- new version 4.2.3p2 - -* Fri Dec 30 2011 anssi 3:4.2.3_P1-1.mga2 -+ Revision: 188952 -- new version 4.2.3-P1 (fixes CVE-2011-4539) - -* Sun Nov 20 2011 zezinho 3:4.2.3-1.mga2 -+ Revision: 169838 -- new version - -* Mon Sep 12 2011 guillomovitch 3:4.2.2-3.mga2 -+ Revision: 142670 -- resync ipv6-not-fatal patch with fedora -- add 3 new fedora patches - * dhcp-4.2.0-add_timeout_when_NULL.patch - * dhcp-4.2.1-64_bit_lease_parse.patch - * dhcp-4.2.2-xen-checksum.patch (attempt to fix #1243) - -* Tue Sep 06 2011 guillomovitch 3:4.2.2-2.mga2 -+ Revision: 139289 -- sync init scripts with fedora (lsb headers, mostly) -- ship systemd service files - -* Tue Aug 30 2011 guillomovitch 3:4.2.2-1.mga2 -+ Revision: 136450 -- add missing LSB header -- new version -- rediff ifup and format-errors patches -- drop wait patch, merged upstream (according to fedora) -- drop prehistoric dhcp 2 -> 3 upgrade script -- spec cleanup - - + tv - - add missing LSB keywords - -* Sun May 15 2011 pterjan 3:4.2.1-0.P1.3.mga1 -+ Revision: 98933 -- Rebuild for fixed find-requires - -* Thu Apr 14 2011 pterjan 3:4.2.1-0.P1.2.mga1 -+ Revision: 84812 -- Re-upload after upload bug - -* Wed Apr 13 2011 tv 3:4.2.1-0.P1.1.mga1 -+ Revision: 84559 -- 4.2.1-P1 -- drop upstream added patch 8 -- Added sample dhclient-exit-hooks, initially handling - rfc3442_classless_static_routes (suggested in #62242). - - + dmorgan - - imported package dhcp - - -* Thu Jan 06 2011 Oden Eriksson 3:4.2.0-0.P2.1mdv2011.0 -+ Revision: 629100 -- 4.2.0-P2 -- bump release -- 4.2.0-P1 - -* Mon Aug 30 2010 Olivier Blin 2:4.2.0-1mdv2011.0 -+ Revision: 574440 -- do not define again _GNU_SOURCE, now defined in default configure script -- 4.2.0 -- LDAP patch merged upstream - -* Mon Jul 12 2010 Eugeni Dodonov 2:4.1.1-7mdv2011.0 -+ Revision: 551267 -- Get rid of some useless wait (rh bug #587070) - -* Fri Jun 11 2010 Oden Eriksson 2:4.1.1-6mdv2010.1 -+ Revision: 547867 -- 4.1.1-P1 - -* Tue Apr 06 2010 Funda Wang 2:4.1.1-5mdv2010.1 -+ Revision: 531983 -- rebuild for new openssl - -* Fri Mar 12 2010 Götz Waschk 2:4.1.1-4mdv2010.1 -+ Revision: 518419 -- remove debug files from devel package - -* Tue Mar 09 2010 Guillaume Rousse 2:4.1.1-3mdv2010.1 -+ Revision: 517076 -- set explicit runlevels in init script - -* Fri Feb 26 2010 Oden Eriksson 2:4.1.1-2mdv2010.1 -+ Revision: 511559 -- rebuilt against openssl-0.9.8m - -* Thu Feb 25 2010 Eugeni Dodonov 2:4.1.1-1mdv2010.1 -+ Revision: 511131 -- Updated to 4.1.1. - Rediff P0, P5, P6, P7. - Drop P9 (merged upstream). - Drop P10 (no longer needed). - -* Wed Feb 17 2010 Eugeni Dodonov 2:4.1.0p1-4mdv2010.1 -+ Revision: 507051 -- Updated ldap patch to use correct variables (#56028). - -* Tue Jan 26 2010 Eugeni Dodonov 2:4.1.0p1-3mdv2010.1 -+ Revision: 496733 -- Allow setting MTU if specified by the server (#57260). - -* Wed Sep 23 2009 Oden Eriksson 2:4.1.0p1-2mdv2010.0 -+ Revision: 447689 -- P9: security fix for CVE-2009-1892 - -* Wed Jul 15 2009 Oden Eriksson 2:4.1.0p1-1mdv2010.0 -+ Revision: 396413 -- 4.1.0p1 - -* Fri Jun 19 2009 Wanderlei Cavassin 2:4.1.0-6mdv2010.0 -+ Revision: 387320 -- fixed lease file parsing for tokens never and epoch (closes mdv #50194) - - + Götz Waschk - - fix URL - -* Wed Mar 04 2009 Gustavo De Nardin 2:4.1.0-5mdv2009.1 -+ Revision: 348205 -- added Patch7, as suggested by Andrey Borzenkov, which prevents - dhclient-script from bringing interfaces down needlessly, which in turn - works around bug #43441 (deassociation going unnoticed by wpa_supplicant, - in the end causing the interface to not get an IP address) - -* Thu Feb 19 2009 Frederic Crozat 2:4.1.0-4mdv2009.1 -+ Revision: 342950 -- Update patch6 with Fedora version which has been submitted upstream for inclusion - -* Fri Jan 09 2009 Frederic Crozat 2:4.1.0-3mdv2009.1 -+ Revision: 327771 -- Patch6: no IPv6 is no longer a fatal error for dhclient - -* Thu Jan 08 2009 Frederic Crozat 2:4.1.0-2mdv2009.1 -+ Revision: 327169 -- Update patch0 to correctly work with resolvconf - -* Thu Jan 08 2009 Frederic Crozat 2:4.1.0-1mdv2009.1 -+ Revision: 327047 -- Release 4.1.0 (Mdv bug #46804) -- Remove detection of 64bits host at buildtime, configure is smart enough now -- Enable IPv6 support -- Regenerate patches 0, 5 -- Remove patches 2 (merged upstream), 4 (useless) -- Patch1 (LDAP support) is now taked from Fedora, as well as source 9, 10, 11, 12 - -* Sat Dec 20 2008 Oden Eriksson 2:3.0.7-2mdv2009.1 -+ Revision: 316549 -- rediffed one fuzzy patch -- fix build with -Werror=format-security (P5) - -* Sun Jul 13 2008 Tomasz Pawel Gajc 2:3.0.7-1mdv2009.0 -+ Revision: 234269 -- update to new version 3.0.7 -- Patch1: new version -- use %%_var instead of %%_localstatedir -- spec file clean - -* Mon Jun 16 2008 Thierry Vignaud 2:3.0.6-6mdv2009.0 -+ Revision: 220615 -- rebuild - - + Pixel - - adapt to %%_localstatedir now being /var instead of /var/lib (#22312) - -* Wed Mar 26 2008 Oden Eriksson 2:3.0.6-5mdv2008.1 -+ Revision: 190309 -- don't start it per default - -* Wed Jan 23 2008 Thierry Vignaud 2:3.0.6-4mdv2008.1 -+ Revision: 157246 -- rebuild with fixed %%serverbuild macro - -* Mon Dec 24 2007 Oden Eriksson 2:3.0.6-3mdv2008.1 -+ Revision: 137459 -- rebuilt against openldap-2.4.7 libs - - + Olivier Blin - - restore BuildRoot - - fix typo in doc description - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - -* Wed Dec 12 2007 Olivier Blin 2:3.0.6-2mdv2008.1 -+ Revision: 119077 -- move rpm-helper requirements in post/preun instead of pre/postun when needed - -* Tue Jul 10 2007 Tomasz Pawel Gajc 2:3.0.6-1mdv2008.0 -+ Revision: 50797 -- new version - -* Wed Jul 04 2007 Andreas Hasenack 2:3.0.5-8mdv2008.0 -+ Revision: 48227 -- use serverbuild macro (-fstack-protector-all) - - -* Wed Mar 28 2007 Olivier Blin 3.0.5-7mdv2007.1 -+ Revision: 149230 -- dhcpcd should start ldap (Daggett) - -* Fri Mar 16 2007 Olivier Blin 2:3.0.5-6mdv2007.1 -+ Revision: 144641 -- drop useless perl(Win32API::Registry) requires exception -- move RFC/API/protocol doc in a dhcp-doc sub-package - -* Sat Mar 10 2007 Olivier Blin 2:3.0.5-5mdv2007.1 -+ Revision: 140432 -- PEERGATEWAY support (#20806) - -* Sat Mar 10 2007 Olivier Blin 2:3.0.5-4mdv2007.1 -+ Revision: 140295 -- default to NEEDHOSTNAME=no, as described in initscripts documentation - -* Thu Jan 11 2007 Olivier Blin 2:3.0.5-3mdv2007.1 -+ Revision: 107599 -- make dhclient-script set DEVICE variable when no ifcfg file is present (to call resolvconf correctly) - -* Tue Jan 02 2007 Olivier Blin 2:3.0.5-2mdv2007.1 -+ Revision: 103318 -- bump release -- do not call unknown /sbin/update-resolvrdv in dhclient-script -- set metric before creating resolv.conf (useful for resolvconf) - -* Thu Nov 16 2006 Guillaume Rousse 2:3.0.5-1mdv2007.1 -+ Revision: 84730 -- new version - install configuration file under real name, not as sample - -* Fri Sep 01 2006 Olivier Blin 2:3.0.4-2mdv2007.0 -+ Revision: 59227 -- add METRIC support in dhclient-script (from Fabrice Facorat, #23164) -- bunzip sources and patches -- Import dhcp - -* Mon May 22 2006 Oden Eriksson 3.0.4-1mdk -- 3.0.4 -- added new rediffed ldap patch (P1) - -* Mon Feb 06 2006 Olivier Blin 3.0.4-0.b2.8mdk -- use $'\n' in dhclient-script (required for initscripts >= 7.66, - since change_resolv_conf doesn't use "echo -e" anymore) - -* Mon Jan 09 2006 Olivier Blin 3.0.4-0.b2.7mdk -- fix requires post and preun -- fix typo in initscript - -* Mon Jan 09 2006 Olivier Blin 3.0.4-0.b2.6mdk -- convert parallel init to LSB - -* Mon Jan 02 2006 Olivier Blin 3.0.4-0.b2.5mdk -- parallel init support - -* Tue Dec 06 2005 Frederic Lepied 3.0.4-0.b2.4mdk -- use change_resolv_conf in dhclient-scripts to be able to do the right -thing wrt nscd. - -* Tue Nov 29 2005 Thierry Vignaud 3.0.4-0.b2.3mdk -- fix build on x86_64 - -* Thu Nov 24 2005 Oden Eriksson 3.0.4-0.b2.2mdk -- exclude debug files in the -devel package, temporary solution - -* Mon Nov 14 2005 Oden Eriksson 3.0.4-0.b2.1mdk -- 3.0.4b2 -- pass "-DLDAP_DEPRECATED" to the CFLAGS -- updated rediffed P1 (dhcp-3.0.3-ldap-patch) -- fix the chroot script so it won't touch the /etc/dhcpd.conf file - -* Wed Aug 31 2005 Oden Eriksson 3.0.3-3mdk -- rebuilt against new openldap-2.3.6 libs - -* Sat Aug 06 2005 Michael Scherer 3.0.3-2mdk -- fill a default config file - -* Mon Aug 01 2005 Oden Eriksson 3.0.3-1mdk -- 3.0.3 -- fix deps -- drop the gcc343 patch (P3), it's fixed upstream -- use the %%mkrel macro - -* Sat Apr 23 2005 Olivier Blin 3.0.2-2mdk -- do not make dhclient-script fail and return DENY return code when no - config file for the interface is found (update and re-indent Patch0) - -* Thu Feb 24 2005 Oden Eriksson 3.0.2-1mdk -- 3.0.2 - -* Fri Feb 04 2005 Buchan Milne 3.0.1-9mdk -- rebuild for ldap2.2_7 - -* Wed Feb 02 2005 Frederic Lepied 3.0.1-8mdk -- back to standard 60 seconds timeout. - -* Wed Feb 02 2005 Frederic Lepied 3.0.1-7mdk -- default timeout to 5 seconds - -* Fri Dec 24 2004 Oden Eriksson 3.0.1-6mdk -- new ldap patch -- renumber sources and patches -- bzip sources -- added P2 that allows us to run it chroot -- added S8 that makes it easier to chroot the server -- fixed S3 to make use of P2 & S8 -- fix pid file location for the dhcpd daemon -- added P3 to make it build with latest cooker gcc (rock linux) -- misc spec file fixes - -* Sat Jul 31 2004 Frederic Lepied 3.0.1-5mdk -- by default hostname is set - -* Sat Jul 31 2004 Frederic Lepied 3.0.1-4mdk -- assign default gateway by interface (updated patch1) - -* Fri Jul 30 2004 Frederic Lepied 3.0.1-3mdk -- only change the hostname if NEEDHOSTNAME=yes (updated patch1) - -* Thu Jul 29 2004 Buchan Milne 3.0.1-2mdk -- update ldap patch - -* Thu Jul 29 2004 Per Øyvind Karlsen 3.0.1-1mdk -- 3.0.1 - -* Thu Jul 01 2004 Florin 3.0-1.rc14.2mdk -- bring back the ldap patch and buildrequires - -* Tue Jun 29 2004 Florin 3.0-1.rc14.1mdk -- rebuild for cooker - -* Tue Jun 22 2004 Vincent Danen 3.0-1.rc14.0.1.100mdk -- 3.0.1rc14 -- security fixes for CAN-2004-0460 (VU#317350) and CAN-2004-0461 (VU#654390) - -* Wed May 05 2004 Per Øyvind Karlsen 3.0-1.rc13.6mdk -- fix buildrequires - -* Sat Apr 24 2004 Florin 3.0-1.rc13.5mdk -- add the dhcp-ldap support diff --git a/dhcpd.service b/dhcpd.service index 4cb5a58..67dcb6d 100644 --- a/dhcpd.service +++ b/dhcpd.service @@ -6,8 +6,8 @@ After=syslog.target network.target ldap.service Environment=CONFIGFILE=/etc/dhcpd.conf LEASEFILE=/var/lib/dhcpd/dhcpd.leases EnvironmentFile=-/etc/sysconfig/dhcpd Type=forking -PIDFile=/run/dhcpd/dhcpd.pid -ExecStart=/usr/sbin/dhcpd -pf /run/dhcpd/dhcpd.pid -cf $CONFIGFILE -lf $LEASEFILE $OPTIONS $INTERFACES +PIDFile=/var/run/dhcpd/dhcpd.pid +ExecStart=/usr/sbin/dhcpd -pf /var/run/dhcpd/dhcpd.pid -cf $CONFIGFILE -lf $LEASEFILE $OPTIONS $INTERFACES [Install] WantedBy=multi-user.target