rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

refresh nss_wrapper, add socket_wrapper

Browse Source
This commit is contained in:
Nalin Dahyabhai 2014-01-31 16:54:08 -05:00
parent 5c7bab5883
commit 956ccfdfb4
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
krb5.spec
View File

@ -71,8 +71,9 @@ Source38: krb5kdc.init
BuildRequires: cmake BuildRequires: cmake
# Carry this locally until it's available in a packaged form. # 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 Source101: noport.c
Source102: socket_wrapper-0.0-20140131205228.tar.xz
Patch6: krb5-1.12-ksu-path.patch Patch6: krb5-1.12-ksu-path.patch
Patch12: krb5-1.12-ktany.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. certificate.
%prep %prep
%setup -q -a 3 -a 100 %setup -q -a 3 -a 100 -a 102
ln -s NOTICE LICENSE ln -s NOTICE LICENSE
%patch201 -p1 -b .Don-t-try-to-stat-not-on-disk-ccache-residuals %patch201 -p1 -b .Don-t-try-to-stat-not-on-disk-ccache-residuals
@ -365,8 +366,9 @@ pushd src
./util/reconf --verbose ./util/reconf --verbose
popd popd
# Create build space for the test wrapper. # Create build spaces for the test wrappers.
mkdir -p nss_wrapper/build 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 # 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. # 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 test -s build-pdf/$pdf.pdf || make -C build-pdf
done done
# Build the test wrapper. # Build the test wrappers.
pushd nss_wrapper/build pushd nss_wrapper/build
cmake .. cmake ..
make make
popd popd
pushd socket_wrapper/build
cmake ..
make
popd
# We need to cut off any access to locally-running nameservers, too. # 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 %{__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. # Set things up to use the test wrappers.
NSS_WRAPPER_HOSTNAME=test.example.com ; export NSS_WRAPPER_HOSTNAME NSS_WRAPPER_HOSTNAME=test.example.com ; export NSS_WRAPPER_HOSTNAME
NSS_WRAPPER_HOSTS="`pwd`/nss_wrapper/fakehosts" ; export NSS_WRAPPER_HOSTS 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 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 # 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 # system, but we can at least run more than we used to. The build system may
@ -992,6 +999,9 @@ exit 0
%changelog %changelog
* Fri Jan 31 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-3 * 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 - add currently-proposed changes to teach ksu about credential cache
collections and the default_ccache_name setting (#1015559,#1026099) collections and the default_ccache_name setting (#1015559,#1026099)

3
sources
View File

@ -1,4 +1,5 @@
4a631b3474d3e44773f1ecda96f04400 krb5-1.12.1.tar.gz 4a631b3474d3e44773f1ecda96f04400 krb5-1.12.1.tar.gz
6a1389393f5f5473933104207216e160 krb5-1.12.1.tar.gz.asc 6a1389393f5f5473933104207216e160 krb5-1.12.1.tar.gz.asc
5852bb09254bcb743ccff4d5b7560f13 krb5-1.12.1-pdf.tar.xz 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