From 905ce3cdf2cdecde36408d11a20f393034fcf0a5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 25 2018 09:28:31 +0000 Subject: debrand dhcp-4.2.5-58.el7_4.1 --- 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 8ee536d..1eb0b9d 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -98,6 +98,7 @@ Patch62: dhcp-max-fd-value.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1355827 Patch63: dhcp-4.2.5-rh1355827.patch Patch64: dhcp-4.2.5-reap_orphan_sockets.patch +Patch65: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf BuildRequires: automake @@ -409,6 +410,7 @@ rm -rf includes/isc-dhcp %patch63 -p1 %patch64 -p1 -b .omapi_sd_leak +%patch65 -p1 # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ @@ -690,6 +692,9 @@ done %changelog +* Thu Jan 25 2018 CentOS Sources - 4.2.5-58.el7.centos.1 +- Roll in CentOS Branding + * Wed Dec 13 2017 Pavel Zhukov - 12:4.2.5-58.1 - Resolves: #1523475 - Fix omapi socket descriptors leak