diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch new file mode 100644 index 0000000..f3e7113 --- /dev/null +++ b/SOURCES/dhcp-4.2.5-centos-branding.patch @@ -0,0 +1,14 @@ +diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c +--- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000 ++++ dhcp-4.1.1-P1/omapip/errwarn.c 2012-08-15 14:13:05.582416057 +0000 +@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... ) + log_error ("have been made to the base software release in order to make"); + log_error ("it work better with this distribution."); + log_error ("%s", ""); +- log_error ("Please report for this software via the Red Hat Bugzilla site:"); +- log_error (" http://bugzilla.redhat.com"); ++ log_error ("Please report for this software via the CentOS Bugs Database:"); ++ log_error (" http://bugs.centos.org/"); + log_error ("%s", ""); + log_error ("exiting."); + #endif diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec index b21ab04..8f45080 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -86,6 +86,7 @@ Patch52: dhcp-IPoIB-log-id.patch Patch53: dhcp-dhc6-life.patch Patch54: dhcp-hop-limit.patch Patch55: dhcp-stateless-store-duid.patch +Patch56: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf BuildRequires: automake @@ -371,6 +372,7 @@ rm -rf includes/isc-dhcp # Write DUID_LLT even in stateless mode (#1156356) %patch55 -p1 -b .stateless-store-duid +%patch56 -p1 # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ @@ -638,6 +640,9 @@ done %changelog +* Thu Mar 05 2015 CentOS Sources - 4.2.5-36.el7.centos +- Roll in CentOS Branding + * Tue Jan 20 2015 Jiri Popelka - 12:4.2.5-36 - use upstream patch for #1147240 (Relay-forward's Hop Limit)