From: Lee Duncan <[email protected]>

This set of patches tells open-iscsi to use the system-resident
open-isns files instead of the ones in utils/open-isns.

This patch *requires* that you've installed open-isns (from
[email protected]:gonzoleeman/open-isns.git).

The first patch tells open-iscsi to use the system-resident
include files and library from open-isns. The second patch
removes the local copy of same.

Questions:
- Should the documentation be updated? I didn't
  find anything that referenced open-isns
- Is it perhaps time to bump the minor version
  of open-iscsi? It's been a while.

Note: it is my intention to create an open-isns package
for SUSE. I assume other platforms will have to do the
same before they could incorporate this patch.


Lee Duncan (2):
  Use system-wide open-isns, not internal version.
  Remove local copy of open-isns.

 Makefile                                           |   10 +-
 usr/Makefile                                       |    7 +-
 usr/discovery.c                                    |    6 +-
 usr/discoveryd.c                                   |    8 +-
 usr/iscsiadm.c                                     |    2 +-
 utils/open-isns/COPYING                            |  504 --
 utils/open-isns/ChangeLog                          |   50 -
 utils/open-isns/HACKING                            |   30 -
 utils/open-isns/Makefile.in                        |   81 -
 utils/open-isns/README                             |  173 -
 utils/open-isns/TODO                               |  100 -
 utils/open-isns/aclocal/config.guess               | 1499 -----
 utils/open-isns/aclocal/config.sub                 | 1570 -----
 utils/open-isns/aclocal/install-sh                 |  251 -
 utils/open-isns/attrs.c                            | 1618 -----
 utils/open-isns/attrs.h                            |  262 -
 utils/open-isns/authblock.c                        |   62 -
 utils/open-isns/bitvector.c                        |  648 --
 utils/open-isns/buffer.c                           |  407 --
 utils/open-isns/buffer.h                           |  141 -
 utils/open-isns/callback.c                         |  148 -
 utils/open-isns/client.c                           |  205 -
 utils/open-isns/compat/my_getopt.c                 |  271 -
 utils/open-isns/compat/my_getopt.h                 |   69 -
 utils/open-isns/config.c                           |  278 -
 utils/open-isns/config.h.in                        |  103 -
 utils/open-isns/configure                          | 6727 --------------------
 utils/open-isns/configure.ac                       |  118 -
 utils/open-isns/db-file.c                          |  615 --
 utils/open-isns/db-policy.c                        |  187 -
 utils/open-isns/db.c                               |  994 ---
 utils/open-isns/db.h                               |  147 -
 utils/open-isns/dd.c                               | 1306 ----
 utils/open-isns/deregister.c                       |  271 -
 utils/open-isns/doc/isns_config.5                  |  387 --
 utils/open-isns/doc/isnsadm.8                      |  688 --
 utils/open-isns/doc/isnsd.8                        |   93 -
 utils/open-isns/doc/isnsdd.8                       |   75 -
 utils/open-isns/domain.c                           |  208 -
 utils/open-isns/entity.c                           |  127 -
 utils/open-isns/error.c                            |   65 -
 utils/open-isns/esi.c                              |  576 --
 utils/open-isns/etc/isnsadm.conf                   |   73 -
 utils/open-isns/etc/isnsd.conf                     |  129 -
 utils/open-isns/etc/isnsdd.conf                    |   72 -
 utils/open-isns/etc/openisns.init                  |   71 -
 utils/open-isns/export.c                           |  547 --
 utils/open-isns/getnext.c                          |  257 -
 utils/open-isns/internal.h                         |   16 -
 utils/open-isns/isns-proto.h                       |  259 -
 utils/open-isns/isns.h                             |  673 --
 utils/open-isns/isnsadm.c                          | 1151 ----
 utils/open-isns/isnsd.c                            |  299 -
 utils/open-isns/isnsdd.c                           | 1153 ----
 utils/open-isns/isnssetup                          |   52 -
 utils/open-isns/local.c                            |  353 -
 utils/open-isns/logging.c                          |  228 -
 utils/open-isns/mdebug.c                           |  295 -
 utils/open-isns/message.c                          |  681 --
 utils/open-isns/message.h                          |  196 -
 utils/open-isns/objects.c                          | 1320 ----
 utils/open-isns/objects.h                          |  168 -
 utils/open-isns/parser.c                           |  134 -
 utils/open-isns/paths.h                            |   22 -
 utils/open-isns/pidfile.c                          |   98 -
 utils/open-isns/pki.c                              |  536 --
 utils/open-isns/policy.c                           |  577 --
 utils/open-isns/portal-group.c                     |  307 -
 utils/open-isns/query.c                            |  238 -
 utils/open-isns/register.c                         |  934 ---
 utils/open-isns/relation.c                         |  281 -
 utils/open-isns/scn.c                              |  926 ---
 utils/open-isns/scope.c                            |  513 --
 utils/open-isns/security.c                         |  437 --
 utils/open-isns/security.h                         |  185 -
 utils/open-isns/server.c                           |  236 -
 utils/open-isns/simple.c                           |  727 ---
 utils/open-isns/slp.c                              |  242 -
 utils/open-isns/socket.c                           | 2304 -------
 utils/open-isns/socket.h                           |   95 -
 utils/open-isns/source.h                           |   32 -
 utils/open-isns/storage-node.c                     |  202 -
 utils/open-isns/sysdep-unix.c                      |  186 -
 utils/open-isns/tags.c                             |  740 ---
 utils/open-isns/tests/.cvsignore                   |    2 -
 utils/open-isns/tests/Makefile                     |   40 -
 utils/open-isns/tests/client.conf                  |    8 -
 utils/open-isns/tests/data/test01/01-enroll        |   18 -
 utils/open-isns/tests/data/test01/02-registration  |   42 -
 utils/open-isns/tests/data/test01/03-query         |   20 -
 utils/open-isns/tests/data/test01/03-registration  |   20 -
 .../open-isns/tests/data/test01/99-unregistration  |   18 -
 utils/open-isns/tests/data/test02/01-enroll        |   18 -
 utils/open-isns/tests/data/test02/02-enroll        |   24 -
 utils/open-isns/tests/data/test02/03-registration  |   72 -
 utils/open-isns/tests/data/test02/04-query         |   20 -
 utils/open-isns/tests/data/test02/05-query         |   20 -
 .../open-isns/tests/data/test02/06-dd-registration |   81 -
 utils/open-isns/tests/data/test02/07-query         |   40 -
 utils/open-isns/tests/data/test02/08-query         |   40 -
 utils/open-isns/tests/data/test02/09-query         |   20 -
 .../open-isns/tests/data/test02/10-dd-registration |   87 -
 utils/open-isns/tests/data/test02/11-query         |   10 -
 .../tests/data/test02/12-dd-deregistration         |   85 -
 .../tests/data/test02/13-dd-deregistration         |   83 -
 .../open-isns/tests/data/test02/14-dd-registration |   85 -
 .../tests/data/test02/15-dd-deregistration         |   76 -
 utils/open-isns/tests/data/test03/01-enroll        |   18 -
 utils/open-isns/tests/data/test03/02-registration  |   42 -
 .../open-isns/tests/data/test03/03-unregistration  |   42 -
 .../open-isns/tests/data/test03/04-unregistration  |   18 -
 .../open-isns/tests/data/test03/99-unregistration  |   13 -
 utils/open-isns/tests/data/test04/01-enroll        |   18 -
 utils/open-isns/tests/data/test04/02-registration  |   42 -
 utils/open-isns/tests/data/test04/03-restart       |   42 -
 utils/open-isns/tests/data/test04/04-query         |   20 -
 utils/open-isns/tests/data/test05/01-enroll        |   18 -
 utils/open-isns/tests/data/test05/02-registration  |   42 -
 utils/open-isns/tests/data/test05/03-expired       |   18 -
 utils/open-isns/tests/data/test06/01-enroll        |   18 -
 utils/open-isns/tests/data/test06/02-registration  |   42 -
 utils/open-isns/tests/data/test06/03-registration  |   42 -
 utils/open-isns/tests/data/test06/04-registration  |   42 -
 .../open-isns/tests/data/test06/05-dd-registration |   49 -
 utils/open-isns/tests/data/test06/06-registration  |   49 -
 .../open-isns/tests/data/test06/07-dd-registration |   52 -
 utils/open-isns/tests/data/test06/08-registration  |   64 -
 utils/open-isns/tests/data/test06/09-registration  |   64 -
 .../open-isns/tests/data/test06/10-unregistration  |   37 -
 utils/open-isns/tests/data/test06/11-registration  |   52 -
 utils/open-isns/tests/data/test07/01-enroll        |   19 -
 utils/open-isns/tests/data/test07/02-registration  |   45 -
 utils/open-isns/tests/data/test07/03-expired       |   19 -
 utils/open-isns/tests/data/test07/04-registration  |   57 -
 utils/open-isns/tests/data/test07/05-expired       |   19 -
 utils/open-isns/tests/data/test08/01-pauw1         |  100 -
 utils/open-isns/tests/data/test09/01-pauw2         |   31 -
 utils/open-isns/tests/data/test10/01-pauw3         |   31 -
 utils/open-isns/tests/data/test10/02-expired       |   31 -
 utils/open-isns/tests/data/test10/03-pauw3         |   31 -
 utils/open-isns/tests/data/test10/04-expired       |   31 -
 utils/open-isns/tests/data/test11/01-pauw4         |   32 -
 utils/open-isns/tests/genkey                       |  175 -
 utils/open-isns/tests/harness.pl                   |  929 ---
 utils/open-isns/tests/pauw1.c                      |  179 -
 utils/open-isns/tests/pauw2.c                      |  212 -
 utils/open-isns/tests/pauw3.c                      |  139 -
 utils/open-isns/tests/pauw4.c                      |  137 -
 utils/open-isns/tests/server.conf                  |   11 -
 utils/open-isns/tests/test01.pl                    |   30 -
 utils/open-isns/tests/test02.pl                    |   58 -
 utils/open-isns/tests/test03.pl                    |   27 -
 utils/open-isns/tests/test04.pl                    |   30 -
 utils/open-isns/tests/test05.pl                    |   25 -
 utils/open-isns/tests/test06.pl                    |   50 -
 utils/open-isns/tests/test07.pl                    |   37 -
 utils/open-isns/tests/test08.pl                    |   23 -
 utils/open-isns/tests/test09.pl                    |   23 -
 utils/open-isns/tests/test10.pl                    |   33 -
 utils/open-isns/tests/test11.pl                    |   23 -
 utils/open-isns/timer.c                            |  126 -
 utils/open-isns/types.h                            |   57 -
 utils/open-isns/util.c                             |  263 -
 utils/open-isns/util.h                             |  289 -
 utils/open-isns/vendor.c                           |   41 -
 utils/open-isns/vendor.h                           |   56 -
 166 files changed, 13 insertions(+), 44211 deletions(-)
 delete mode 100644 utils/open-isns/COPYING
 delete mode 100644 utils/open-isns/ChangeLog
 delete mode 100644 utils/open-isns/HACKING
 delete mode 100644 utils/open-isns/Makefile.in
 delete mode 100644 utils/open-isns/README
 delete mode 100644 utils/open-isns/TODO
 delete mode 100644 utils/open-isns/aclocal/config.guess
 delete mode 100644 utils/open-isns/aclocal/config.sub
 delete mode 100644 utils/open-isns/aclocal/install-sh
 delete mode 100644 utils/open-isns/attrs.c
 delete mode 100644 utils/open-isns/attrs.h
 delete mode 100644 utils/open-isns/authblock.c
 delete mode 100644 utils/open-isns/bitvector.c
 delete mode 100644 utils/open-isns/buffer.c
 delete mode 100644 utils/open-isns/buffer.h
 delete mode 100644 utils/open-isns/callback.c
 delete mode 100644 utils/open-isns/client.c
 delete mode 100644 utils/open-isns/compat/my_getopt.c
 delete mode 100644 utils/open-isns/compat/my_getopt.h
 delete mode 100644 utils/open-isns/config.c
 delete mode 100644 utils/open-isns/config.h.in
 delete mode 100755 utils/open-isns/configure
 delete mode 100644 utils/open-isns/configure.ac
 delete mode 100644 utils/open-isns/db-file.c
 delete mode 100644 utils/open-isns/db-policy.c
 delete mode 100644 utils/open-isns/db.c
 delete mode 100644 utils/open-isns/db.h
 delete mode 100644 utils/open-isns/dd.c
 delete mode 100644 utils/open-isns/deregister.c
 delete mode 100644 utils/open-isns/doc/isns_config.5
 delete mode 100644 utils/open-isns/doc/isnsadm.8
 delete mode 100644 utils/open-isns/doc/isnsd.8
 delete mode 100644 utils/open-isns/doc/isnsdd.8
 delete mode 100644 utils/open-isns/domain.c
 delete mode 100644 utils/open-isns/entity.c
 delete mode 100644 utils/open-isns/error.c
 delete mode 100644 utils/open-isns/esi.c
 delete mode 100644 utils/open-isns/etc/isnsadm.conf
 delete mode 100644 utils/open-isns/etc/isnsd.conf
 delete mode 100644 utils/open-isns/etc/isnsdd.conf
 delete mode 100644 utils/open-isns/etc/openisns.init
 delete mode 100644 utils/open-isns/export.c
 delete mode 100644 utils/open-isns/getnext.c
 delete mode 100644 utils/open-isns/internal.h
 delete mode 100644 utils/open-isns/isns-proto.h
 delete mode 100644 utils/open-isns/isns.h
 delete mode 100644 utils/open-isns/isnsadm.c
 delete mode 100644 utils/open-isns/isnsd.c
 delete mode 100644 utils/open-isns/isnsdd.c
 delete mode 100644 utils/open-isns/isnssetup
 delete mode 100644 utils/open-isns/local.c
 delete mode 100644 utils/open-isns/logging.c
 delete mode 100644 utils/open-isns/mdebug.c
 delete mode 100644 utils/open-isns/message.c
 delete mode 100644 utils/open-isns/message.h
 delete mode 100644 utils/open-isns/objects.c
 delete mode 100644 utils/open-isns/objects.h
 delete mode 100644 utils/open-isns/parser.c
 delete mode 100644 utils/open-isns/paths.h
 delete mode 100644 utils/open-isns/pidfile.c
 delete mode 100644 utils/open-isns/pki.c
 delete mode 100644 utils/open-isns/policy.c
 delete mode 100644 utils/open-isns/portal-group.c
 delete mode 100644 utils/open-isns/query.c
 delete mode 100644 utils/open-isns/register.c
 delete mode 100644 utils/open-isns/relation.c
 delete mode 100644 utils/open-isns/scn.c
 delete mode 100644 utils/open-isns/scope.c
 delete mode 100644 utils/open-isns/security.c
 delete mode 100644 utils/open-isns/security.h
 delete mode 100644 utils/open-isns/server.c
 delete mode 100644 utils/open-isns/simple.c
 delete mode 100644 utils/open-isns/slp.c
 delete mode 100644 utils/open-isns/socket.c
 delete mode 100644 utils/open-isns/socket.h
 delete mode 100644 utils/open-isns/source.h
 delete mode 100644 utils/open-isns/storage-node.c
 delete mode 100644 utils/open-isns/sysdep-unix.c
 delete mode 100644 utils/open-isns/tags.c
 delete mode 100644 utils/open-isns/tests/.cvsignore
 delete mode 100644 utils/open-isns/tests/Makefile
 delete mode 100644 utils/open-isns/tests/client.conf
 delete mode 100644 utils/open-isns/tests/data/test01/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test01/02-registration
 delete mode 100644 utils/open-isns/tests/data/test01/03-query
 delete mode 100644 utils/open-isns/tests/data/test01/03-registration
 delete mode 100644 utils/open-isns/tests/data/test01/99-unregistration
 delete mode 100644 utils/open-isns/tests/data/test02/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test02/02-enroll
 delete mode 100644 utils/open-isns/tests/data/test02/03-registration
 delete mode 100644 utils/open-isns/tests/data/test02/04-query
 delete mode 100644 utils/open-isns/tests/data/test02/05-query
 delete mode 100644 utils/open-isns/tests/data/test02/06-dd-registration
 delete mode 100644 utils/open-isns/tests/data/test02/07-query
 delete mode 100644 utils/open-isns/tests/data/test02/08-query
 delete mode 100644 utils/open-isns/tests/data/test02/09-query
 delete mode 100644 utils/open-isns/tests/data/test02/10-dd-registration
 delete mode 100644 utils/open-isns/tests/data/test02/11-query
 delete mode 100644 utils/open-isns/tests/data/test02/12-dd-deregistration
 delete mode 100644 utils/open-isns/tests/data/test02/13-dd-deregistration
 delete mode 100644 utils/open-isns/tests/data/test02/14-dd-registration
 delete mode 100644 utils/open-isns/tests/data/test02/15-dd-deregistration
 delete mode 100644 utils/open-isns/tests/data/test03/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test03/02-registration
 delete mode 100644 utils/open-isns/tests/data/test03/03-unregistration
 delete mode 100644 utils/open-isns/tests/data/test03/04-unregistration
 delete mode 100644 utils/open-isns/tests/data/test03/99-unregistration
 delete mode 100644 utils/open-isns/tests/data/test04/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test04/02-registration
 delete mode 100644 utils/open-isns/tests/data/test04/03-restart
 delete mode 100644 utils/open-isns/tests/data/test04/04-query
 delete mode 100644 utils/open-isns/tests/data/test05/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test05/02-registration
 delete mode 100644 utils/open-isns/tests/data/test05/03-expired
 delete mode 100644 utils/open-isns/tests/data/test06/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test06/02-registration
 delete mode 100644 utils/open-isns/tests/data/test06/03-registration
 delete mode 100644 utils/open-isns/tests/data/test06/04-registration
 delete mode 100644 utils/open-isns/tests/data/test06/05-dd-registration
 delete mode 100644 utils/open-isns/tests/data/test06/06-registration
 delete mode 100644 utils/open-isns/tests/data/test06/07-dd-registration
 delete mode 100644 utils/open-isns/tests/data/test06/08-registration
 delete mode 100644 utils/open-isns/tests/data/test06/09-registration
 delete mode 100644 utils/open-isns/tests/data/test06/10-unregistration
 delete mode 100644 utils/open-isns/tests/data/test06/11-registration
 delete mode 100644 utils/open-isns/tests/data/test07/01-enroll
 delete mode 100644 utils/open-isns/tests/data/test07/02-registration
 delete mode 100644 utils/open-isns/tests/data/test07/03-expired
 delete mode 100644 utils/open-isns/tests/data/test07/04-registration
 delete mode 100644 utils/open-isns/tests/data/test07/05-expired
 delete mode 100644 utils/open-isns/tests/data/test08/01-pauw1
 delete mode 100644 utils/open-isns/tests/data/test09/01-pauw2
 delete mode 100644 utils/open-isns/tests/data/test10/01-pauw3
 delete mode 100644 utils/open-isns/tests/data/test10/02-expired
 delete mode 100644 utils/open-isns/tests/data/test10/03-pauw3
 delete mode 100644 utils/open-isns/tests/data/test10/04-expired
 delete mode 100644 utils/open-isns/tests/data/test11/01-pauw4
 delete mode 100644 utils/open-isns/tests/genkey
 delete mode 100644 utils/open-isns/tests/harness.pl
 delete mode 100644 utils/open-isns/tests/pauw1.c
 delete mode 100644 utils/open-isns/tests/pauw2.c
 delete mode 100644 utils/open-isns/tests/pauw3.c
 delete mode 100644 utils/open-isns/tests/pauw4.c
 delete mode 100644 utils/open-isns/tests/server.conf
 delete mode 100644 utils/open-isns/tests/test01.pl
 delete mode 100644 utils/open-isns/tests/test02.pl
 delete mode 100644 utils/open-isns/tests/test03.pl
 delete mode 100644 utils/open-isns/tests/test04.pl
 delete mode 100644 utils/open-isns/tests/test05.pl
 delete mode 100644 utils/open-isns/tests/test06.pl
 delete mode 100644 utils/open-isns/tests/test07.pl
 delete mode 100644 utils/open-isns/tests/test08.pl
 delete mode 100644 utils/open-isns/tests/test09.pl
 delete mode 100644 utils/open-isns/tests/test10.pl
 delete mode 100644 utils/open-isns/tests/test11.pl
 delete mode 100644 utils/open-isns/timer.c
 delete mode 100644 utils/open-isns/types.h
 delete mode 100644 utils/open-isns/util.c
 delete mode 100644 utils/open-isns/util.h
 delete mode 100644 utils/open-isns/vendor.c
 delete mode 100644 utils/open-isns/vendor.h

-- 
2.1.4

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.

Reply via email to