Removed 'exceptions' from License.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@888 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 11 insertions, 31 deletions

diff --git a/pki/base/symkey/LICENSE b/pki/base/symkey/LICENSE
index e36f2269a..fbd2b7ff4 100644
--- a/pki/base/symkey/LICENSE
+++ b/pki/base/symkey/LICENSE
@@ -10,26 +10,6 @@ for more details.
 You should have received a copy of the GNU General Public License 
 along with this Program; if not, write to the Free Software 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-In addition, as a special exception, Red Hat, Inc. gives You the additional 
-right to link the code of this Program with code not covered under the GNU 
-General Public License ("Non-GPL Code") and to distribute linked combinations 
-including the two, subject to the limitations in this paragraph. Non-GPL 
-Code permitted under this exception must only link to the code of this 
-Program through those well defined interfaces identified in the file named 
-EXCEPTION found in the source code files (the "Approved Interfaces"). 
- 
-The files of Non-GPL Code may instantiate templates or use macros or inline
-functions from the Approved Interfaces without causing the resulting work to 
-be covered by the GNU General Public License. Only Red Hat, Inc. may make 
-changes or additions to the list of Approved Interfaces. You must obey the 
-GNU General Public License in all respects for all of the Program code and 
-other code used in conjunction with the Program except the Non-GPL Code 
-covered by this exception. If you modify this file, you may extend this 
-exception to your version of the file, but you are not obligated to do so. 
-If you do not wish to provide this exception without modification, you must 
-delete this exception statement from your version and license this file 
-solely under the GPL without exception.
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
diff --git a/pki/base/symkey/configure b/pki/base/symkey/configure
index 598093696..65ac43fc5 100755
--- a/pki/base/symkey/configure
+++ b/pki/base/symkey/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for symkey 1.3.0.
+# Generated by GNU Autoconf 2.63 for symkey 1.3.1.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='symkey'
 PACKAGE_TARNAME='symkey'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='symkey 1.3.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='symkey 1.3.1'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -1530,7 +1530,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures symkey 1.3.0 to adapt to many kinds of systems.
+\`configure' configures symkey 1.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1600,7 +1600,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of symkey 1.3.0:";;
+     short | recursive ) echo "Configuration of symkey 1.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1719,7 +1719,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-symkey configure 1.3.0
+symkey configure 1.3.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1733,7 +1733,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by symkey $as_me 1.3.0, which was
+It was created by symkey $as_me 1.3.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2585,7 +2585,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='symkey'
- VERSION='1.3.0'
+ VERSION='1.3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23807,7 +23807,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by symkey $as_me 1.3.0, which was
+This file was extended by symkey $as_me 1.3.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23870,7 +23870,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-symkey config.status 1.3.0
+symkey config.status 1.3.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/pki/base/symkey/configure.ac b/pki/base/symkey/configure.ac
index 6b3713763..4c245bc23 100644
--- a/pki/base/symkey/configure.ac
+++ b/pki/base/symkey/configure.ac
@@ -20,7 +20,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([symkey], [1.3.0], [http://bugzilla.redhat.com/])
+AC_INIT([symkey], [1.3.1], [http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])