From 0640cd40fe3009471c6574a532ed69e6a5cbb849db0c3920489779e3ee51cd53 Mon Sep 17 00:00:00 2001 From: Darin Perusich Date: Fri, 5 Sep 2014 13:39:08 +0000 Subject: [PATCH] Accepting request 247715 from home:deadpoint:branches:server:dns OBS-URL: https://build.opensuse.org/request/show/247715 OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=10 --- unbound-1.0.0_buffer_overflow.patch | 13 --------- unbound-1.0.0_preserve_cflags.patch | 26 ----------------- unbound-1.0.0_stupid_rpath.patch | 26 ----------------- unbound.changes | 6 ++++ unbound.spec | 45 +++++++++++++++-------------- 5 files changed, 29 insertions(+), 87 deletions(-) delete mode 100644 unbound-1.0.0_buffer_overflow.patch delete mode 100644 unbound-1.0.0_preserve_cflags.patch delete mode 100644 unbound-1.0.0_stupid_rpath.patch diff --git a/unbound-1.0.0_buffer_overflow.patch b/unbound-1.0.0_buffer_overflow.patch deleted file mode 100644 index a843d30..0000000 --- a/unbound-1.0.0_buffer_overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: smallapp/unbound-checkconf.c -=================================================================== ---- smallapp/unbound-checkconf.c.orig 2008-04-24 14:37:01.000000000 +0200 -+++ smallapp/unbound-checkconf.c 2008-05-21 22:15:10.695878674 +0200 -@@ -329,7 +329,7 @@ morechecks(struct config_file* cfg, char - fatal_exit("getcwd: %s", strerror(errno)); - strncat(buf, "/", sizeof(buf)); - } -- strncat(buf, fname, sizeof(buf)); -+ strncat(buf, fname, (sizeof(buf)-strlen(buf)-1)); - if(strncmp(buf, cfg->chrootdir, strlen(cfg->chrootdir)) != 0) - fatal_exit("config file %s is not inside chroot %s", - buf, cfg->chrootdir); diff --git a/unbound-1.0.0_preserve_cflags.patch b/unbound-1.0.0_preserve_cflags.patch deleted file mode 100644 index fbe5297..0000000 --- a/unbound-1.0.0_preserve_cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig 2008-05-21 21:58:25.000000000 +0200 -+++ configure.ac 2008-05-21 21:58:55.708851124 +0200 -@@ -31,7 +31,7 @@ AC_SUBST(LIBUNBOUND_CURRENT) - AC_SUBST(LIBUNBOUND_REVISION) - AC_SUBST(LIBUNBOUND_AGE) - --CFLAGS= -+#CFLAGS= - AC_AIX - - dnl -Index: configure -=================================================================== ---- configure.orig 2008-05-21 21:58:25.000000000 +0200 -+++ configure 2008-05-21 21:59:15.326039225 +0200 -@@ -1947,7 +1947,7 @@ LIBUNBOUND_AGE=0 - - - --CFLAGS= -+#CFLAGS= - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/unbound-1.0.0_stupid_rpath.patch b/unbound-1.0.0_stupid_rpath.patch deleted file mode 100644 index f0d7918..0000000 --- a/unbound-1.0.0_stupid_rpath.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -497,7 +497,7 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- - else - AC_MSG_RESULT(found in $ssldir) - HAVE_SSL=yes -- LDFLAGS="$LDFLAGS -L$ssldir/lib" -+ LDFLAGS="$LDFLAGS" - if test "x$enable_rpath" = xyes; then - RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib" - fi -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -20884,7 +20884,7 @@ echo "$as_me: error: Cannot find the SSL - { echo "$as_me:$LINENO: result: found in $ssldir" >&5 - echo "${ECHO_T}found in $ssldir" >&6; } - HAVE_SSL=yes -- LDFLAGS="$LDFLAGS -L$ssldir/lib" -+ LDFLAGS="$LDFLAGS" - if test "x$enable_rpath" = xyes; then - RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib" - fi diff --git a/unbound.changes b/unbound.changes index 6d03ef6..2b2bb11 100644 --- a/unbound.changes +++ b/unbound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 5 13:32:55 UTC 2014 - darin@darins.net + +- cleanup .spec +- removed unused packes + ------------------------------------------------------------------- Tue Sep 2 13:21:55 UTC 2014 - darin@darins.net diff --git a/unbound.spec b/unbound.spec index 523d2e7..f367f1c 100644 --- a/unbound.spec +++ b/unbound.spec @@ -1,4 +1,19 @@ -# norootforbuild +# +# spec file for package unbound +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# %bcond_without python %bcond_without munin @@ -9,14 +24,16 @@ %else %bcond_with systemd %endif + # only needed for < 1310 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} + # %define _sharedstatedir /var/lib/ %define ldns_version 1.6.16 - %define fwdir /etc/sysconfig/SuSEfirewall2.d/services +# %if 0%{?suse_version} > 1220 %define piddir /run %else @@ -30,7 +47,7 @@ Name: unbound Version: 1.4.22 -Release: 1 +Release: 0 # Group: Productivity/Networking/DNS/Servers License: BSD-3-Clause @@ -159,7 +176,9 @@ export CXXFLAGS="%{optflags} -fPIE -pie" --with-pthreads \ --disable-static \ --with-ldns=%{_prefix} \ - --enable-sha2 --enable-gost --enable-ecdsa \ + --enable-sha2 \ + --enable-gost \ + --enable-ecdsa \ --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \ --with-pidfile=%{piddir}%{name}/%{name}.pid \ %if %{with python} @@ -167,24 +186,6 @@ export CXXFLAGS="%{optflags} -fPIE -pie" %endif --with-rootkey-file=%{_sharedstatedir}/unbound/root.key -# --with-pyunbound --with-pythonmodule -# --with-conf-file=path Pathname to the Unbound configuration file -# --with-run-dir=path set default directory to chdir to (by default dir -# part of cfg file) -# --with-chroot-dir=path set default directory to chroot to (by default same -# as run-dir) -# --with-share-dir=path set default directory with shared data (by default -# same as share/unbound) -# --with-pidfile=filename set default pathname to unbound pidfile (default -# run-dir/unbound.pid) -# --with-rootkey-file=filename -# set default pathname to root key file (default -# run-dir/root.key). This file is read and written. -# --with-rootcert-file=filename -# set default pathname to root update certificate file -# (default run-dir/icannbundle.pem). This file need -# not exist if you are content with the builtin. -# %{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags} streamtcp