Install libnss to /lib, really fix #688590, thanks to Christian Grothoff.

5 files changed, 77 insertions, 37 deletions

diff --git a/debian/gnunet-server.install b/debian/gnunet-server.install
index 95ff725..36fa2e8 100644
--- a/debian/gnunet-server.install
+++ b/debian/gnunet-server.install
@@ -41,9 +41,9 @@ usr/lib/libgnunettransport.so.*
 usr/lib/libgnunettransporttesting.so.*
 usr/lib/libgnunettun.so.*
 usr/lib/libgnunetvpn.so.*
-usr/lib/libnss_gns.so.2
-usr/lib/libnss_gns4.so.2
-usr/lib/libnss_gns6.so.2
+lib/libnss_gns.so.2
+lib/libnss_gns4.so.2
+lib/libnss_gns6.so.2
 usr/lib/gnunet/*.so
 usr/share/gnunet/config.d
 usr/share/gnunet/hellos/*
diff --git a/debian/patches/configure_libnss.diff b/debian/patches/configure_libnss.diff
new file mode 100644
index 0000000..89abf75
--- /dev/null
+++ b/debian/patches/configure_libnss.diff
@@ -0,0 +1,71 @@
+--- a/src/gns/nss/Makefile.am
++++ b/src/gns/nss/Makefile.am
+@@ -21,20 +21,18 @@
+ 
+ AM_LDFLAGS=-avoid-version -module -export-dynamic
+ 
+-if HAVE_SUDO
+-nssdir = /lib/
+-else
+-nssdir = $(libdir)
+-endif
++nssdir = $(NSS_DIR)
+ 
+ LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
+ 
+ if !MINGW
++if INSTALL_NSS
+ nss_LTLIBRARIES = \
+ 	libnss_gns.la \
+ 	libnss_gns4.la \
+ 	libnss_gns6.la
+ endif
++endif
+ 
+ sources = nss_gns_query.h nss_gns_query.c
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -780,6 +780,42 @@
+ AC_SUBST(SUDO_BINARY)
+ AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /])
+ 
++
++# test for nssdir
++AC_MSG_CHECKING(with nssdir)
++AC_ARG_WITH(nssdir,
++  [  --with-nssdir=PATH       where to install NSS plugins],
++  [AC_MSG_RESULT("$with_nssdir")
++   case $with_nssdir in
++   no)
++     NSS_DIR=
++     install_nss=0
++     ;;
++   yes)
++     NSS_DIR="/lib"
++     install_nss=1
++     ;;
++   *)
++     NSS_DIR=$with_nssdir
++     install_nss=1
++    ;;
++   esac
++  ],
++  [
++   if test "x$SUDO_BINARY" != "x" -o -w /
++   then
++     NSS_DIR="/lib"
++     install_nss=1
++     AC_MSG_RESULT([yes, to /lib])
++   else
++     NSS_DIR=
++     install_nss=0
++     AC_MSG_RESULT([no])
++   fi
++  ])
++AC_SUBST(NSS_DIR)
++AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"])
++
+ # test for gnunetdns group name
+ GNUNETDNS_GROUP=gnunetdns
+ AC_MSG_CHECKING(for gnunetdns group name)
diff --git a/debian/patches/fix_nss_libdir.diff b/debian/patches/fix_nss_libdir.diff
deleted file mode 100644
index 19d3b0f..0000000
--- a/debian/patches/fix_nss_libdir.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/gns/nss/Makefile.am
-+++ b/src/gns/nss/Makefile.am
-@@ -21,16 +21,10 @@
- 
- AM_LDFLAGS=-avoid-version -module -export-dynamic
- 
--if HAVE_SUDO
--nssdir = /lib/
--else
--nssdir = $(libdir)
--endif
--
- LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
- 
- if !MINGW
--nss_LTLIBRARIES = \
-+lib_LTLIBRARIES = \
- 	libnss_gns.la \
- 	libnss_gns4.la \
- 	libnss_gns6.la
-@@ -52,8 +46,8 @@
- libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
- 
- install-data-hook:
--	$(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(nssdir)
--	$(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.la $(nssdir)/libnss_gns4.la $(nssdir)/libnss_gns6.la 
-+	$(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(libdir)
-+	$(SUDO_BINARY) rm -f $(libdir)/libnss_gns.la $(libdir)/libnss_gns4.la $(libdir)/libnss_gns6.la
- 
- uninstall-hook:
--	$(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.so.2 $(nssdir)/libnss_gns4.so.2 $(nssdir)/libnss_gns6.so.2 
-+	$(SUDO_BINARY) rm -f $(libdir)/libnss_gns.so.2 $(libdir)/libnss_gns4.so.2 $(libdir)/libnss_gns6.so.2
diff --git a/debian/patches/series b/debian/patches/series
index ffffb2f..16f2d7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
+configure_libnss.diff
 libgcrypt_version_check.diff
 unix_match_uid.diff
-fix_nss_libdir.diff
 fix_kfreebsd_build.diff
 support_GNU_hurd.patch
 sparc_alignment.patch
diff --git a/debian/rules b/debian/rules
index fc88ba8..b7e42b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ SHELL := sh -e
 	dh ${@} --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath --enable-guile --enable-ipv6 --with-microhttpd=yes $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- --disable-rpath --enable-guile --enable-ipv6 --with-microhttpd=yes --with-nssdir=yes $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_test:
 	# Disabling test suite, incomplete
@@ -27,6 +27,7 @@ override_dh_auto_install:
 	
 	# Removing useless files
 	rm -f debian/tmp/usr/lib/*.la debian/tmp/usr/lib/gnunet/*.la \
+		debian/tmp/lib/*.la \
 		debian/tmp/usr/share/doc/gnunet/COPYING \
 		debian/tmp/usr/bin/gnunet-service-template \
 		debian/tmp/usr/bin/gnunet-template \