diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-31 16:54:08 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-01-31 16:56:05 -0500 |
| commit | 956ccfdfb471839cb8fc9b481e4365245ebb20b5 (patch) | |
| tree | 7804cee98ea4b31273892b39cf573b70f51ee044 | |
| parent | 5c7bab5883f22abfa99b4092de27adc3ff713721 (diff) | |
| download | krb5-956ccfdfb471839cb8fc9b481e4365245ebb20b5.tar.gz krb5-956ccfdfb471839cb8fc9b481e4365245ebb20b5.tar.xz krb5-956ccfdfb471839cb8fc9b481e4365245ebb20b5.zip | |
refresh nss_wrapper, add socket_wrapper
| -rw-r--r-- | krb5.spec | 22 | ||||
| -rw-r--r-- | sources | 3 |
2 files changed, 18 insertions, 7 deletions
@@ -71,8 +71,9 @@ Source38: krb5kdc.init BuildRequires: cmake # Carry this locally until it's available in a packaged form. -Source100: nss_wrapper-0.0-20130719153839Z.git6cb59864.bz2 +Source100: nss_wrapper-0.0-20140131205218.tar.xz Source101: noport.c +Source102: socket_wrapper-0.0-20140131205228.tar.xz Patch6: krb5-1.12-ksu-path.patch Patch12: krb5-1.12-ktany.patch @@ -302,7 +303,7 @@ to obtain initial credentials from a KDC using a private key and a certificate. %prep -%setup -q -a 3 -a 100 +%setup -q -a 3 -a 100 -a 102 ln -s NOTICE LICENSE %patch201 -p1 -b .Don-t-try-to-stat-not-on-disk-ccache-residuals @@ -365,8 +366,9 @@ pushd src ./util/reconf --verbose popd -# Create build space for the test wrapper. +# 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. @@ -462,11 +464,15 @@ for pdf in admin appdev basic build plugindev user ; do test -s build-pdf/$pdf.pdf || make -C build-pdf done -# Build the test wrapper. +# 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 @@ -482,9 +488,10 @@ fi # 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" +echo 127.0.0.1 $NSS_WRAPPER_HOSTNAME $NSS_WRAPPER_HOSTNAME localhost localhost >"$NSS_WRAPPER_HOSTS" NOPORT=53,111; export NOPORT -LD_PRELOAD=`pwd`/noport.so:`pwd`/nss_wrapper/build/src/libnss_wrapper.so ; export LD_PRELOAD +SOCKET_WRAPPER_DIR=`pwd`/sockets; mkdir -p $SOCKET_WRAPPER_DIR; export SOCKET_WRAPPER_DIR +LD_PRELOAD=`pwd`/noport.so:`pwd`/nss_wrapper/build/src/libnss_wrapper.so:`pwd`/socket_wrapper/build/src/libsocket_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. The build system may @@ -992,6 +999,9 @@ exit 0 %changelog * Fri Jan 31 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-3 +- refresh nss_wrapper and add socket_wrapper to the %%check environment + +* Fri Jan 31 2014 Nalin Dahyabhai <nalin@redhat.com> - add currently-proposed changes to teach ksu about credential cache collections and the default_ccache_name setting (#1015559,#1026099) @@ -1,4 +1,5 @@ 4a631b3474d3e44773f1ecda96f04400 krb5-1.12.1.tar.gz 6a1389393f5f5473933104207216e160 krb5-1.12.1.tar.gz.asc 5852bb09254bcb743ccff4d5b7560f13 krb5-1.12.1-pdf.tar.xz -0d676f5babfc3c5f9e685d6538850021 nss_wrapper-0.0-20130719153839Z.git6cb59864.bz2 +070b0ae01bbc1e03b5a1fbf2b0ae51d8 nss_wrapper-0.0-20140131205218.tar.xz +d2135add41a83254bfc138bccb838303 socket_wrapper-0.0-20140131205228.tar.xz |