From 580aefb618b4daccaa0120d7f874843bebcd8bce Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Fri, 26 Jun 2015 02:47:13 +0200 Subject: [PATCH] * Thu Jun 25 2015 Roland Mainz - 1.13.2-6 - Use system nss_wrapper and socket_wrapper for testing. Patch by Andreas Schneider --- ...t_wrapper_eventfd_prototype_mismatch.patch | 38 ------------------- krb5.spec | 38 +++++++------------ sources | 2 - 3 files changed, 13 insertions(+), 65 deletions(-) delete mode 100644 krb5-socket_wrapper_eventfd_prototype_mismatch.patch diff --git a/krb5-socket_wrapper_eventfd_prototype_mismatch.patch b/krb5-socket_wrapper_eventfd_prototype_mismatch.patch deleted file mode 100644 index 5dc221d..0000000 --- a/krb5-socket_wrapper_eventfd_prototype_mismatch.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./socket_wrapper/src/socket_wrapper.c 2014-09-30 11:23:19.733011302 +0200 -+++ ./socket_wrapper/src/socket_wrapper.c 2014-09-30 11:25:11.599141672 +0200 -@@ -294,7 +294,7 @@ - int (*libc_dup)(int fd); - int (*libc_dup2)(int oldfd, int newfd); - #ifdef HAVE_EVENTFD -- int (*libc_eventfd)(int count, int flags); -+ int (*libc_eventfd)(unsigned int count, int flags); - #endif - int (*libc_getpeername)(int sockfd, - struct sockaddr *addr, -@@ -528,7 +528,7 @@ - } - - #ifdef HAVE_EVENTFD --static int libc_eventfd(int count, int flags) -+static int libc_eventfd(unsigned int count, int flags) - { - swrap_load_lib_function(SWRAP_LIBC, eventfd); - -@@ -4159,7 +4159,7 @@ - ***************************/ - - #ifdef HAVE_EVENTFD --static int swrap_eventfd(int count, int flags) -+static int swrap_eventfd(unsigned int count, int flags) - { - int fd; - -@@ -4171,7 +4171,7 @@ - return fd; - } - --int eventfd(int count, int flags) -+int eventfd(unsigned int count, int flags) - { - return swrap_eventfd(count, flags); - } diff --git a/krb5.spec b/krb5.spec index d72ed12..9b65971 100644 --- a/krb5.spec +++ b/krb5.spec @@ -43,7 +43,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.13.2 -Release: 5%{?dist} +Release: 6%{?dist} # - Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar # - The sources below are stored in a lookaside cache. Upload with @@ -76,9 +76,7 @@ Source38: krb5kdc.init Source39: krb5-krb5kdc.conf # Carry this locally until it's available in a packaged form. -Source100: nss_wrapper-0.0-20140204195100.git3d58327.tar.xz -Source101: noport.c -Source102: socket_wrapper-0.0-20140204194748.gitf3b2ece.tar.xz +Source100: noport.c Patch6: krb5-1.12-ksu-path.patch Patch12: krb5-1.12-ktany.patch @@ -92,7 +90,6 @@ Patch86: krb5-1.9-debuginfo.patch Patch105: krb5-kvno-230379.patch Patch129: krb5-1.11-run_user_0.patch Patch134: krb5-1.11-kpasswdtest.patch -Patch136: krb5-socket_wrapper_eventfd_prototype_mismatch.patch Patch140: krb5-1.14-Support-KDC_ERR_MORE_PREAUTH_DATA_REQUIRED.patch Patch143: krb5-tests_use_libs_from_build.patch Patch144: krb5-1.13.3-bindresvport_sa_port_byte_swap_bug_triggering_selinux_avc_denial.patch @@ -167,6 +164,9 @@ BuildRequires: nss-devel >= 3.13 BuildRequires: libverto-devel %endif +BuildRequires: nss_wrapper +BuildRequires: socket_wrapper + %description Kerberos V5 is a trusted-third-party network authentication system, which can improve your network's security by eliminating the insecure @@ -291,7 +291,7 @@ to obtain initial credentials from a KDC using a private key and a certificate. %prep -%setup -q -n %{name}-%{version}%{prerelease} -a 3 -a 100 -a 102 +%setup -q -n %{name}-%{version}%{prerelease} -a 3 ln NOTICE LICENSE %patch60 -p1 -b .pam @@ -313,10 +313,6 @@ ln NOTICE LICENSE %patch134 -p1 -b .kpasswdtest -%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 -%patch136 -p1 -%endif - %patch140 -p1 -b .krb5-1.14-support-kdc_err_more_preauth_data_required %patch143 -p1 -b .krb5-tests_use_libs_from_build %patch144 -p1 -b .krb5-1.13.3-bindresvport_sa_port_byte_swap_bug_triggering_selinux_avc_denial @@ -340,10 +336,6 @@ pushd src ./util/reconf --verbose popd -# Create build spaces for the test wrappers. -mkdir -p nss_wrapper/build -mkdir -p socket_wrapper/build - # Mess with some of the default ports that we use for testing, so that multiple # builds going on the same host don't step on each other. cfg="src/kadmin/testing/proto/kdc.conf.proto \ @@ -451,16 +443,6 @@ done pax -wv -x ustar build-pdf/*.pdf | xz -9 >"krb5-%{version}-pdf.pax.xz.new" # false -# Build the test wrappers. -pushd nss_wrapper/build -cmake .. -make -popd -pushd socket_wrapper/build -cmake .. -make -popd - # We need to cut off any access to locally-running nameservers, too. %{__cc} -fPIC -shared -o noport.so -Wall -Wextra $RPM_SOURCE_DIR/noport.c @@ -472,13 +454,15 @@ if hostname | grep -q build ; then fi %endif +mkdir nss_wrapper + # Set things up to use the test wrappers. export NSS_WRAPPER_HOSTNAME=test.example.com export NSS_WRAPPER_HOSTS="$PWD/nss_wrapper/fakehosts" printf '127.0.0.1 %s %s %s %s\n' "$NSS_WRAPPER_HOSTNAME" "$NSS_WRAPPER_HOSTNAME" 'localhost' 'localhost' >"$NSS_WRAPPER_HOSTS" export NOPORT='53,111' export SOCKET_WRAPPER_DIR="$PWD/sockets" ; mkdir -p $SOCKET_WRAPPER_DIR -export LD_PRELOAD="$PWD/noport.so:$PWD/nss_wrapper/build/src/libnss_wrapper.so:$PWD/socket_wrapper/build/src/libsocket_wrapper.so" +export LD_PRELOAD="$PWD/noport.so:libnss_wrapper.so:libsocket_wrapper.so" # Run the test suite. We can't actually run the whole thing in the build # system, but we can at least run more than we used to. The build system may @@ -1003,6 +987,10 @@ exit 0 %changelog +* Thu Jun 25 2015 Roland Mainz - 1.13.2-6 +- Use system nss_wrapper and socket_wrapper for testing. + Patch by Andreas Schneider + * Thu Jun 25 2015 Roland Mainz - 1.13.2-5 - Remove Zanata test glue and related workarounds - Bug #1234292 ("IPA server cannot be run in container due to incorrect /usr/sbin/_kadmind") diff --git a/sources b/sources index a5016be..b3b1463 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ -142c7f3f8d2b08936d2cee3de743133e nss_wrapper-0.0-20140204195100.git3d58327.tar.xz -d8e42cf537192765463c3f1bad870250 socket_wrapper-0.0-20140204194748.gitf3b2ece.tar.xz d3c480887984f14ecd8d93fd30a11896 krb5-1.13.1-pdf.pax.xz f9b9275c6ceb9e6c39fabecc00c6a059 krb5-1.13.2.tar.gz b62135d2089349b571479feb39f049c9 krb5-1.13.2.tar.gz.asc