View Issue Details

IDProjectCategoryView StatusLast Update
0007203CentOS-7dhcppublic2014-06-19 14:19
ReporterJohnnyHughes Assigned To 
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Summary0007203: dhcp for CentOS 7 needs branding removal
DescriptionThe package states to report issues to bugzilla.rednat.com. The 3 attached patches change the branding.
TagsNo tags attached.
abrt_hash
URL

Activities

JohnnyHughes

JohnnyHughes

2014-06-18 18:19

administrator  

0001-add-branding-patch.patch (1,363 bytes)   
From 9031637086b0b6f2479574b3e327c2e9588ce20a Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Wed, 18 Jun 2014 12:43:43 -0500
Subject: [PATCH 1/3] add branding patch

---
 SOURCES/dhcp-4.2.5-centos-branding.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 SOURCES/dhcp-4.2.5-centos-branding.patch

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
-- 
1.8.3.1

0001-add-branding-patch.patch (1,363 bytes)   
JohnnyHughes

JohnnyHughes

2014-06-18 18:19

administrator  

0002-spec-patch-changes.patch (968 bytes)   
From dccbbc28ad4aa9c718d062620ceffa3d4a094261 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Wed, 18 Jun 2014 12:49:39 -0500
Subject: [PATCH 2/3] spec patch changes

---
 SPECS/dhcp.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index b858e34..bd7968e 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -82,6 +82,8 @@ Patch48:  dhcp-4.2.5-next-server.patch
 Patch49:  dhcp-4.2.5-ipv6-bind-to-interface.patch
 Patch50:  dhcp-ffff-checksum.patch
 
+Patch1000: dhcp-4.2.5-centos-branding.patch 
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -352,6 +354,8 @@ rm -rf includes/isc-dhcp
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #25587])
 %patch50 -p1 -b .ffff
 
+%patch1000 -p1 -b .centos
+
 # Update paths in all man pages
 for page in client/dhclient.conf.5 client/dhclient.leases.5 \
             client/dhclient-script.8 client/dhclient.8 ; do
-- 
1.8.3.1

JohnnyHughes

JohnnyHughes

2014-06-18 18:19

administrator  

0003-spec-changelog-entry.patch (630 bytes)   
From 0eb591c3e6ad88ce85ed0517a3f67e11b03b2412 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Wed, 18 Jun 2014 12:52:26 -0500
Subject: [PATCH 3/3] spec changelog entry

---
 SPECS/dhcp.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index bd7968e..50beb0c 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -623,6 +623,9 @@ done
 
 
 %changelog
+* Wed Jun 18 2014 Johnny Hughes <johnny@centos.org> - 12:4.2.5-27.el7.centos
+- Roll in CentOS Branding
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 12:4.2.5-27
 - Mass rebuild 2014-01-24
 
-- 
1.8.3.1

tigalch

tigalch

2014-06-19 14:19

manager   ~0019957

Solved in builds from 20140619 onward

Issue History

Date Modified Username Field Change
2014-06-18 18:18 JohnnyHughes New Issue
2014-06-18 18:19 JohnnyHughes File Added: 0001-add-branding-patch.patch
2014-06-18 18:19 JohnnyHughes File Added: 0002-spec-patch-changes.patch
2014-06-18 18:19 JohnnyHughes File Added: 0003-spec-changelog-entry.patch
2014-06-19 14:19 tigalch Note Added: 0019957
2014-06-19 14:19 tigalch Status new => resolved
2014-06-19 14:19 tigalch Resolution open => fixed