From f358ed16490f2b581b91cf729d2f7d43e38d584c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2019 22:25:54 +0000 Subject: import dhcp-4.2.5-79.el7 --- diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch deleted file mode 100644 index f3e7113..0000000 --- a/SOURCES/dhcp-4.2.5-centos-branding.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 46f0614..e77ee33 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -119,7 +119,6 @@ Patch76: dhcp-isc_heap_delete.patch Patch77: dhcp-handle_ctx_signals.patch Patch78: dhcp-system_time_changed.patch Patch79: dhcp-close_file_in_noreplay.patch -Patch80: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf BuildRequires: automake @@ -467,7 +466,6 @@ rm -rf includes/isc-dhcp %patch78 -p1 -b .monotonic %patch79 -p1 -b .close-noreplay -%patch80 -p1 # Update paths in all man pages @@ -750,9 +748,6 @@ done %changelog -* Sat Nov 02 2019 CentOS Sources - 4.2.5-79.el7.centos -- Roll in CentOS Branding - * Tue Oct 1 2019 Pavel Zhukov - 12:4.2.5-79 - Resolves: #1756850 - Close FD in noreplay mode