Merge remote-tracking branch 'origin/debian' into HEAD

Conflicts:
	debian/changelog

diff --git a/configure.ac b/configure.ac
index ea4ba1e..06cc7d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,20 +37,20 @@ if test "$GCC" = "yes" ; then
 #        ])
     CFLAGS="-Wall $GCC_CFLAGS"
     CXXFLAGS="-Wall $GCC_CXXFLAGS"
-else
-# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
-       case "${host_cpu}-${host_os}" in
-               *solaris*)
-                       if test "$CXX" = "CC" ; then
-                               CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
-                       fi
-                       ;;
-               *osf*)
-                       CXXFLAGS="$CXXFLAGS -D_POSIX_PII_SOCKET"
-                       ;;
-       esac
 fi
 
+# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
+# Also enables POSIX semantics for some functions.
+case "${host_cpu}-${host_os}" in
+    *solaris*)
+       CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+       CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+       if test "$CXX" = "CC" ; then
+               CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
+       fi
+    ;;
+esac
+
 AC_LANG(C)
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/debian/changelog b/debian/changelog
index ba35a8b..ee519f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+shibboleth-resolver (0.3-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 13 Dec 2011 15:25:53 -0500
+
 shibboleth-resolver (0.2-3) unstable; urgency=low
 
   * Rebuild to catch new dependencies

diff --git a/resolver.spec.in b/resolver.spec.in
index 6d3fc2a..1bb5d4a 100644 (file)
--- a/resolver.spec.in
+++ b/resolver.spec.in
@@ -71,7 +71,7 @@ This package includes files needed for development.
 %setup -q
 
 %build
-%configure %{?options} --with-gssapi=%{_prefix}
+%configure %{?options}
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install
@@ -95,7 +95,6 @@ This package includes files needed for development.
 %files -n libshibresolver1
 %defattr(-,root,root,-)
 %{_libdir}/libshibresolver.so.*
-%{_libdir}/libshibresolver-lite.so.*
 
 %files -n libshibresolver-devel
 %defattr(-,root,root,-)