diff options
author | Nalin Dahyabhai <nalin@redhat.com> | 2013-07-26 18:47:03 -0400 |
---|---|---|
committer | Nalin Dahyabhai <nalin@redhat.com> | 2013-07-26 18:47:03 -0400 |
commit | 4c8469c2580ee1aaba3302a281e8871642d14828 (patch) | |
tree | a2980d6c44c284e56dc6f511bf83ecc61a6b5037 | |
parent | 66d99286516c96bcfa1ec543b85ea7ccfad1136b (diff) | |
download | krb5-4c8469c2580ee1aaba3302a281e8871642d14828.tar.gz krb5-4c8469c2580ee1aaba3302a281e8871642d14828.tar.xz krb5-4c8469c2580ee1aaba3302a281e8871642d14828.zip |
tweak configs used by testskrb5-1.11.3-6.fc19
- tweak configuration files used during tests to try to reduce the number
of conflicts encountered when builds for multiple arches land on the same
builder
-rw-r--r-- | krb5-1.11-kpasswdtest.patch | 10 | ||||
-rw-r--r-- | krb5.spec | 47 | ||||
-rw-r--r-- | noport.c (renamed from noport53.c) | 41 |
3 files changed, 82 insertions, 16 deletions
diff --git a/krb5-1.11-kpasswdtest.patch b/krb5-1.11-kpasswdtest.patch new file mode 100644 index 0000000..f07b225 --- /dev/null +++ b/krb5-1.11-kpasswdtest.patch @@ -0,0 +1,10 @@ +--- krb5-1.11.3/src/kadmin/testing/proto/krb5.conf.proto ++++ krb5-1.11.3/src/kadmin/testing/proto/krb5.conf.proto +@@ -7,6 +7,7 @@ + __REALM__ = { + kdc = __KDCHOST__:1750 + admin_server = __KDCHOST__:1751 ++ kpasswd_server = __KDCHOST__:1752 + database_module = foobar_db2_module_blah + } + @@ -30,7 +30,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.11.3 -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.11/krb5-1.11.3-signed.tar Source0: krb5-%{version}.tar.gz @@ -56,10 +56,10 @@ Source36: kpropd.init Source37: kadmind.init Source38: krb5kdc.init -BuildRequires: cmake, strace +BuildRequires: cmake # Carry this locally until it's available in a packaged form. Source100: nss_wrapper.tar.bz2 -Source101: noport53.c +Source101: noport.c Patch5: krb5-1.10-ksu-access.patch Patch6: krb5-1.10-ksu-path.patch @@ -92,6 +92,7 @@ Patch130: krb5-master-init_referral.patch Patch131: krb5-1.11.3-skew3.patch Patch132: krb5-1.11-gss-methods1.patch Patch133: krb5-1.11-gss-methods2.patch +Patch134: krb5-1.11-kpasswdtest.patch # Patches for otp plugin backport Patch201: krb5-1.11.2-keycheck.patch @@ -321,6 +322,7 @@ ln -s NOTICE LICENSE %patch131 -p1 -b .skew3 %patch132 -p1 -b .gss-methods1 %patch133 -p1 -b .gss-methods2 +%patch134 -p1 -b .kpasswdtest %patch201 -p1 -b .keycheck %patch202 -p1 -b .otp @@ -349,6 +351,30 @@ popd # Create build space for the test wrapper. mkdir -p nss_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 \ + src/kadmin/testing/proto/krb5.conf.proto \ + src/lib/kadm5/unit-test/api.current/init-v2.exp \ + src/util/k5test.py \ + src/tests/kdc_realm/input_conf/*.conf \ + src/tests/mk_migr/ldap_backend/input_conf/*.conf \ + src/tests/mk_migr/db2_backend/input_conf/*.conf" +LONG_BIT=`getconf LONG_BIT` +PORT=`expr 61000 + $LONG_BIT - 48` +sed -i -e s,61000,`expr "$PORT" + 0`,g $cfg +PORT=`expr 1750 + $LONG_BIT - 48` +sed -i -e s,1750,`expr "$PORT" + 0`,g $cfg +sed -i -e s,1751,`expr "$PORT" + 1`,g $cfg +sed -i -e s,1752,`expr "$PORT" + 2`,g $cfg +PORT=`expr 8888 + $LONG_BIT - 48` +sed -i -e s,8888,`expr "$PORT" - 0`,g $cfg +sed -i -e s,8887,`expr "$PORT" - 1`,g $cfg +sed -i -e s,8886,`expr "$PORT" - 2`,g $cfg +PORT=`expr 7777 + $LONG_BIT - 48` +sed -i -e s,7777,`expr "$PORT" + 0`,g $cfg +sed -i -e s,7778,`expr "$PORT" + 1`,g $cfg + %build # Go ahead and supply tcl info, because configure doesn't know how to find it. . %{_libdir}/tclConfig.sh @@ -426,20 +452,24 @@ make popd # We need to cut off any access to locally-running nameservers, too. -%{__cc} -fPIC -shared -o noport53.so -Wall -Wextra $RPM_SOURCE_DIR/noport53.c +%{__cc} -fPIC -shared -o noport.so -Wall -Wextra $RPM_SOURCE_DIR/noport.c %check # Set things up to use the test wrappers. NSS_WRAPPER_HOSTNAME=test.example.com ; export NSS_WRAPPER_HOSTNAME NSS_WRAPPER_HOSTS="`pwd`/nss_wrapper/fakehosts" ; export NSS_WRAPPER_HOSTS echo 127.0.0.1 $NSS_WRAPPER_HOSTNAME $NSS_WRAPPER_HOSTNAME >"$NSS_WRAPPER_HOSTS" -NOPORT53=1; export NOPORT53 -LD_PRELOAD=`pwd`/noport53.so:`pwd`/nss_wrapper/build/src/libnss_wrapper.so ; export LD_PRELOAD +NOPORT=53,111; export NOPORT +LD_PRELOAD=`pwd`/noport.so:`pwd`/nss_wrapper/build/src/libnss_wrapper.so ; export LD_PRELOAD # 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. make -C src runenv.py : make -C src check TMPDIR=%{_tmppath} +# Alright, this much is still a work in progress. +%if %{__isa_bits} == 64 +sleep 600 +%endif make -C src/lib check TMPDIR=%{_tmppath} OFFLINE=yes make -C src/kdc check TMPDIR=%{_tmppath} make -C src/appl check TMPDIR=%{_tmppath} @@ -868,6 +898,11 @@ exit 0 %{_sbindir}/uuserver %changelog +* Fri Jul 26 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-6 +- tweak configuration files used during tests to try to reduce the number + of conflicts encountered when builds for multiple arches land on the same + builder + * Mon Jul 22 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-5 - pull up changes to allow GSSAPI modules to provide more functions (RT#7682, #986564/#986565) @@ -3,8 +3,33 @@ #include <dlfcn.h> #include <errno.h> #include <stdlib.h> +#include <string.h> #include <netinet/in.h> +static int +port_is_okay(unsigned short port) +{ + char *p, *q; + long l; + + p = getenv("NOPORT"); + while ((p != NULL) && (*p != '\0')) { + l = strtol(p, &q, 10); + if ((q == NULL) || (q == p)) { + break; + } + if ((*q == '\0') || (*q == ',')) { + if (port == l) { + errno = ECONNREFUSED; + return -1; + } + } + p = q; + p += strspn(p, ","); + } + return 0; +} + int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) { @@ -19,22 +44,20 @@ connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) } } - if (getenv("NOPORT53") == NULL) { + if (getenv("NOPORT") == NULL) { return next_connect(sockfd, addr, addrlen); } switch (addr->sa_family) { case AF_INET: port = ntohs(((struct sockaddr_in *)addr)->sin_port); - if (port == 53) { - errno = ECONNREFUSED; + if (port_is_okay(port) != 0) { return -1; } break; case AF_INET6: port = ntohs(((struct sockaddr_in6 *)addr)->sin6_port); - if (port == 53) { - errno = ECONNREFUSED; + if (port_is_okay(port) != 0) { return -1; } break; @@ -60,22 +83,20 @@ sendto(int sockfd, const void *buf, size_t len, int flags, } } - if (getenv("NOPORT53") == NULL) { + if (getenv("NOPORT") == NULL) { return next_sendto(sockfd, buf, len, flags, dest_addr, addrlen); } switch (dest_addr->sa_family) { case AF_INET: port = ntohs(((struct sockaddr_in *)dest_addr)->sin_port); - if (port == 53) { - errno = ECONNREFUSED; + if (port_is_okay(port) != 0) { return -1; } break; case AF_INET6: port = ntohs(((struct sockaddr_in6 *)dest_addr)->sin6_port); - if (port == 53) { - errno = ECONNREFUSED; + if (port_is_okay(port) != 0) { return -1; } break; |