From 338ed5a3c43e4b78f27b68c204524129d745124747f20aa9371853c6b71b851a Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Wed, 27 Mar 2013 14:46:26 +0000
Subject: [PATCH] - Update to ISC dhcp-4.2.5-P1 release, which contains updated
bind-9.8.4-P2 sources with removed regex.h check in configure
(bnc#811934, CVE-2013-2266). - Changed spec make the bind export library
build output visible.
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=102
---
dhcp-4.2.5-P1.tar.gz | 3 ++
dhcp-4.2.5-P1.tar.gz.asc | 11 ++++++
dhcp-4.2.5.tar.gz | 3 --
dhcp-4.2.5.tar.gz.asc | 11 ------
dhcp.changes | 8 ++++
dhcp.keyring | 82 +++++++++++++++-------------------------
dhcp.spec | 18 ++++++---
7 files changed, 64 insertions(+), 72 deletions(-)
create mode 100644 dhcp-4.2.5-P1.tar.gz
create mode 100644 dhcp-4.2.5-P1.tar.gz.asc
delete mode 100644 dhcp-4.2.5.tar.gz
delete mode 100644 dhcp-4.2.5.tar.gz.asc
diff --git a/dhcp-4.2.5-P1.tar.gz b/dhcp-4.2.5-P1.tar.gz
new file mode 100644
index 0000000..3a0ae0d
--- /dev/null
+++ b/dhcp-4.2.5-P1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250
+size 8255960
diff --git a/dhcp-4.2.5-P1.tar.gz.asc b/dhcp-4.2.5-P1.tar.gz.asc
new file mode 100644
index 0000000..63c2fb0
--- /dev/null
+++ b/dhcp-4.2.5-P1.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (NetBSD)
+
+iQEcBAABAgAGBQJRS2FeAAoJEEWseFcYnNvFjYIH/3S6p2g7sqAbTJaNA81UdIQc
+mw2JgfejtbNGIdBhD+iM3AazwO9zVIQfD7mpHhIgSwtBXu2kYlCOaLy+GSTRLLWv
+gu1/0J2JPJTx9WoMWYEOPG/qhYYQKX+Xj7ldIFat/7ADOGCYCfZWNhsYZ79T0GCL
+tj/jX2bQXDzTeEMHHywBr8MdGGzn1k6mCduyENXpmTBlLT5PfdABWku5iu6efFMS
+doLZ5rUYGxxBTmbZJLZjScNI2DNH2UTIxRx58rVYPaXNi91pPRflXoIDpwiKHYfK
+6uqshS8z8bMGhSMTLdm5NcWS16ABCFOTmr2RCeQ144VD8L/FNgPEj+vNTMKb9Rs=
+=klp9
+-----END PGP SIGNATURE-----
diff --git a/dhcp-4.2.5.tar.gz b/dhcp-4.2.5.tar.gz
deleted file mode 100644
index fcea089..0000000
--- a/dhcp-4.2.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:771a5cffb1fd1392d25926e22e1c58a006e2ad02ecd77d136096e5e366a5b6bc
-size 8258824
diff --git a/dhcp-4.2.5.tar.gz.asc b/dhcp-4.2.5.tar.gz.asc
deleted file mode 100644
index f01e62c..0000000
--- a/dhcp-4.2.5.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iQEcBAABAgAGBQJQ7X+pAAoJEKv5WqfJazUKeaQH/134banTGLmI/lOsmaWzB/kJ
-jKYRQ20N6oGTn52pJhMLK9SAJML/MjYr84sJxCZSN7IirSOd0OEUKk2N4A3kKlGj
-DteALPgG9cDIu8huVc4ZUKfbAl6Gr4irWBBWcRbXK8CnH+9Z3OjaaEilEOqfJl9d
-fV8e38YNDaLyo4mH8lLyByPYqTBnt6FGYJH6kzO9a9rvWQQ0hAMGX9hUAQTJRJbP
-j6ZOL807qcZFhy16bpVz3IFTZ17rbV3cYwP4e8fYjN9W3evOpN+GUtgwI/WSgAiH
-1LL74Iq3nyptCrS544avIQGjHX64fgahYWP9VQvCzsL9bWnEXIMoaHNhmUd/Wdo=
-=D0E8
------END PGP SIGNATURE-----
diff --git a/dhcp.changes b/dhcp.changes
index 8ac1996..f04f66e 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 27 13:20:43 UTC 2013 - mt@suse.com
+
+- Update to ISC dhcp-4.2.5-P1 release, which contains updated
+ bind-9.8.4-P2 sources with removed regex.h check in configure
+ (bnc#811934, CVE-2013-2266).
+- Changed spec make the bind export library build output visible.
+
-------------------------------------------------------------------
Tue Mar 12 15:17:19 UTC 2013 - mt@suse.com
diff --git a/dhcp.keyring b/dhcp.keyring
index cf38b75..d7caddc 100644
--- a/dhcp.keyring
+++ b/dhcp.keyring
@@ -1,55 +1,33 @@
-pub 2048R/C96B350A 2011-10-27 [expires: 2013-02-01]
-uid Internet Systems Consortium, Inc. (Signing key, 2012) (http://www.isc.org/) <codesign@isc.org>
-uid [jpeg image of size 37431]
-sub 2048R/B5053426 2011-10-27 [expires: 2013-02-01]
-
+pub 2048R/189CDBC5 2013-01-31 Internet Systems Consortium, Inc. (Signing key, 2013) <codesign@isc.org>
+sub 2048R/7F3D1D53 2013-01-31 [expires: 2015-01-31]
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (FreeBSD)
+Version: GnuPG v1.4.12 (NetBSD)
-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
-=WEoZ
+mQENBFEKeFYBCADaN83gsb0VDjlGZkYra0PPlHz/eczKBU+/6I/VBq/FcsFEc27/
+O8IE05rIID10rXLjZ0k8y4ydvhI40eVZfxwaFvQEX/StVtU1ie3F7TS02ZuJ1yal
+YRtU29hhnZ5icDdiJ98gcZSH2WKhIWLRpmc60Lja/sTsO0lkLPJe9x2MDuzkQu9M
+Z7hlMgqZxZ1I/mQ/KsjT3oUt8euwyntg8/w/cpY8H0EVjyBnZWV2yejsLnbCo947
+hbjvUMSluGs7AZP0d+yqpGNsgRQ9iHy0NiL3ELdBqD22cqGRGTkX76KcLoXvqLVY
+450bBtXsI2uUXy5iL/eUkUP2JgWQybjju/M3ABEBAAG0SEludGVybmV0IFN5c3Rl
+bXMgQ29uc29ydGl1bSwgSW5jLiAoU2lnbmluZyBrZXksIDIwMTMpIDxjb2Rlc2ln
+bkBpc2Mub3JnPokBPgQTAQIAKAUCUQp4VgIbAwUJA8JnAAYLCQgHAwIGFQgCCQoL
+BBYCAwECHgECF4AACgkQRax4Vxic28XzIQf6AwLblJ98KI6l8gWqKVHMErYgl9+Q
+RiIxrqJtyn4OjeZHX9diVjv2HlsRjnTpNl5MiSB9tXvq+GX696w6dtpoqYjZEQoP
+ZCwE2USR6XO71eYO3rxLBnc0ymRvQm4zB2YKqworQDym0+wE8xiGBO8LyyVDfS5G
+aGWXl0YJkfNYXzhEp6toIiLwRE0uP0TarHcHCo2CboVBgODvDZqwSBfT+i6dT+Gy
+6nVEh3j7XnqgjCQ25cGev9sHR3hobT/fxG0F2YZ7sMwpWj9q0Y/dOlY7SV/ZGSs+
+ubKQ55BWsTjJRrNqyDX8QLb8oVic5q/yQkV+RTs1sP5s6JSs0KqQdyR3ZbkBDQRR
+CnhWAQgApxtu688JKcr6NXWOneWXn1Pti2jRhdVKNlNkGgLJ76vQTVdMmmTDwEty
+YQM6C9qjIXj8cEwz+LGRUXoCXOX9Yokf5oOjNpQutn4KVS+IRvWMYaK0qsTaa/c0
+FaIiFWvswyGucXAX/q9H5IoK8uYKXv5ww7+x3l1etg9/QdDQ/CANyMQbjBn38Wfn
+Fy/zoUl+mMZLfqs+3NwT5C+m/4M99SoyC7XQLaZt3PBO4rVjUnMkCgiXsNdDIZnv
+0XgUKyzSgrdPZcqKEG3yj8v5aTOC2k60Ffw1/ytA3hyfxLmdxxsyGyNQ4ZY8ZxmB
+Z6AyUWVK95bL4oQqUCqfzSscHpWokQARAQABiQElBBgBAgAPBQJRCnhWAhsMBQkD
+wmcAAAoJEEWseFcYnNvF4JAH/0MlU+Iwu5k6II3KufE2agMsRD2hk1VkpZcC08qi
+LfHxX/4HrCZd7jcViLpFeK+I5JaDM2G21Co9jBMoPh+EUDnalG3eglXgeNEbUfAZ
+pM7c9UejTNVmrw6crcgeUhKS2l0oBu9gRRlcSJEYY8XngfKJHBscCrsafp3RMVkO
+m4Ti4CcxOot3uQ10U8GojjtWp7bgqIaFBF8aV8vugXJLl9IHqgVEtvo9miM+0Tfi
+evOzuZMrgVY4zI2ZiLcrVM1KuIeZ2nIKbNWkJpDH2ZwUfsIx/KTxjpqld+NStzGQ
+B9v1wazIBDHQU4hq5ddOlk0lrLDAmMJzHbavlduWmFRkuv4=
+=bGLP
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/dhcp.spec b/dhcp.spec
index 1a7f902..7edd854 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -16,7 +16,7 @@
#
-%define isc_version 4.2.5
+%define isc_version 4.2.5-P1
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define omc_prefix /usr/share/omc
%define omc_svcdir %{omc_prefix}/svcinfo.d
@@ -36,7 +36,7 @@ BuildRequires: openldap2-devel
%endif
BuildRequires: dos2unix
BuildRequires: libtool
-Version: 4.2.5
+Version: 4.2.5.P1
Release: 0.<RELEASE0>
Summary: Common Files Used by ISC DHCP Software
License: BSD-3-Clause
@@ -93,7 +93,7 @@ Patch48: dhcp-4.2.3-P1-dhclient-log-pid.diff
Patch49: dhcp-4.2.4-interface-discovery-using-getifaddrs.patch
Patch50: dhcp-4.2.4-P2-do-not-die-on-sigpipe.patch
##
-Patch51: config-guess-sub-update.patch
+Patch60: config-guess-sub-update.patch
PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1220
@@ -230,15 +230,15 @@ Authors:
##
find . -type f -name \*.cat\* -exec rm -f {} \;
dos2unix contrib/ms2isc/*
-
-%build
# Remove GPL licensed files to make sure,
# they're not used to build (bnc#714004).
pushd bind
gunzip -c bind.tar.gz | tar xf -
rm -rf bind-*/contrib/dbus
-patch -p0 -d bind-* < %{P:51}
+%patch60 -p0 -d bind-*
popd
+
+%build
%if %suse_version >= 1210
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -W -Wall -Wno-unused"
%else
@@ -288,6 +288,12 @@ autoreconf
--with-srv6-pid-file=%{_localstatedir}/run/dhcpd6.pid \
--with-srv6-lease-file=%{_localstatedir}/lib/dhcp6/db/dhcpd6.leases
#
+: building bind sources
+make -C bind all
+cat bind/configure.log
+cat bind/build.log
+cat bind/install.log
+: building dhcp sources
make %{?_smp_mflags}
%check