[GNUnet-SVN] r23849 - gnunet/src/gns/nss

[gnunet]

Author: grothoff
Date: 2012-09-17 14:07:58 +0200 (Mon, 17 Sep 2012)
New Revision: 23849

Added:
   gnunet/src/gns/nss/uninstall-nss-plugin.sh
Modified:
   gnunet/src/gns/nss/Makefile.am
   gnunet/src/gns/nss/install-nss-plugin.sh
   gnunet/src/gns/nss/nss_gns.c
   gnunet/src/gns/nss/nss_gns_query.c
   gnunet/src/gns/nss/nss_gns_query.h
Log:
-adding GPLv3 license, adding uninstall script to fix #2534

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2012-09-17 11:56:04 UTC (rev 23848)
+++ gnunet/src/gns/nss/Makefile.am      2012-09-17 12:07:58 UTC (rev 23849)
@@ -3,8 +3,8 @@
 # This file taken and modified from nss-gns.
 #
 # nss-gns is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
+# under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
 # License, or (at your option) any later version.
 #
 # nss-gns is distributed in the hope that it will be useful, but
@@ -52,17 +52,11 @@
 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 
 if !MINGW
-if HAVE_SUDO
 install-data-hook:
        $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) 
$(top_builddir) $(nssdir) $(SUDO_BINARY)
 
 uninstall-hook:
-       $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SUDO_BINARY) 
$(nssdir)
-
-endif  
-else
-install-data-hook:
-
-uninstall-hook:
-
+       $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY)
+       $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY)
+       $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY)
 endif

Modified: gnunet/src/gns/nss/install-nss-plugin.sh
===================================================================
--- gnunet/src/gns/nss/install-nss-plugin.sh    2012-09-17 11:56:04 UTC (rev 
23848)
+++ gnunet/src/gns/nss/install-nss-plugin.sh    2012-09-17 12:07:58 UTC (rev 
23849)
@@ -3,7 +3,6 @@
 # $2 - top_builddir
 # $3 - nssdir
 # $4 - sudo binary (empty if root)
-$4 $1 $2/libtool --finish $3
+$4 $1 $2/libtool --mode=finish $3
+echo LTINST: $4 $1 $2/libtool --mode=finish $3
 $4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la
-
-

Modified: gnunet/src/gns/nss/nss_gns.c
===================================================================
--- gnunet/src/gns/nss/nss_gns.c        2012-09-17 11:56:04 UTC (rev 23848)
+++ gnunet/src/gns/nss/nss_gns.c        2012-09-17 12:07:58 UTC (rev 23849)
@@ -4,8 +4,8 @@
     Parts taken from: nss.c in nss-mdns
 
     nss-mdns is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published
-    by the Free Software Foundation; either version 2 of the License,
+    it under the terms of the GNU General Public License as published
+    by the Free Software Foundation; either version 3 of the License,
     or (at your option) any later version.
  
     nss-mdns is distributed in the hope that it will be useful, but1

Modified: gnunet/src/gns/nss/nss_gns_query.c
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.c  2012-09-17 11:56:04 UTC (rev 23848)
+++ gnunet/src/gns/nss/nss_gns_query.c  2012-09-17 12:07:58 UTC (rev 23849)
@@ -1,3 +1,22 @@
+/*
+     This file is part of GNUnet.
+     (C) 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: gnunet/src/gns/nss/nss_gns_query.h
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.h  2012-09-17 11:56:04 UTC (rev 23848)
+++ gnunet/src/gns/nss/nss_gns_query.h  2012-09-17 12:07:58 UTC (rev 23849)
@@ -1,3 +1,22 @@
+/*
+     This file is part of GNUnet.
+     (C) 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
 #ifndef NSS_GNS_QUERY_H
 #define NSS_GNS_QUERY_H
 
@@ -2,26 +21,4 @@
 /**
- * Parts taken from nss-mdns. Original license statement follows
+ * Parts taken from nss-mdns
  */
-
-/* $Id$ */
-
-/***
-  This file is part of nss-mdns.
- 
-  nss-mdns is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
- 
-  nss-mdns is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public
-  License along with nss-mdns; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
 #include <inttypes.h>

Copied: gnunet/src/gns/nss/uninstall-nss-plugin.sh (from rev 23846, 
gnunet/src/gns/nss/install-nss-plugin.sh)
===================================================================
--- gnunet/src/gns/nss/uninstall-nss-plugin.sh                          (rev 0)
+++ gnunet/src/gns/nss/uninstall-nss-plugin.sh  2012-09-17 12:07:58 UTC (rev 
23849)
@@ -0,0 +1,8 @@
+#!/bin/bash
+# $1 - shell
+# $2 - top_builddir
+# $3 - nssdir+path of library to remove
+# $4 - sudo binary (empty if root)
+$4 $1 $2/libtool --mode=uninstall $3
+
+