3.13-1

- Use Tarballs from Offical Repos
- Update for pre-3.14 master
- Remove Non-OpenDDS patches

7 files changed, 46 insertions, 227 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index b894fd088d80..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgbase = opendds-git
-	pkgdesc = Open source C++ implementation of OMG Data Distribution Service (DDS)
-	pkgver = 3.5.1
-	pkgrel = 1
-	url = http://www.opendds.org/
-	install = opendds.install
-	arch = i686
-	arch = x86_64
-	license = custom
-	makedepends = git
-	depends = perl
-	depends = bash
-	source = MPC::git+https://github.com/bbidulock/MPC.git
-	source = ORB::git+https://github.com/bbidulock/Middleware.git
-	source = DDS::git+https://github.com/bbidulock/DDS.git
-	source = build.patch
-	source = tao-cosnaming.service
-	options = !buildflags
-
-pkgname = opendds-git
-
diff --git a/.SRCINFO b/.SRCINFO
index 0350675b94d1..aae6ee003427 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = opendds-git
 	pkgdesc = Open source C++ implementation of OMG Data Distribution Service (DDS)
-	pkgver = 3.5.1
+	pkgver = 3.13
 	pkgrel = 1
 	url = http://www.opendds.org/
-	install = opendds.install
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -11,16 +10,14 @@ pkgbase = opendds-git
 	depends = perl
 	depends = bash
 	options = !buildflags
-	source = MPC::git+https://github.com/bbidulock/MPC.git
-	source = ORB::git+https://github.com/bbidulock/Middleware.git
-	source = DDS::git+https://github.com/bbidulock/DDS.git
+	source = MPC.tar.gz::https://github.com/DOCGroup/MPC/tarball/master
+	source = ACE_TAO.tar.gz::https://github.com/DOCGroup/ACE_TAO/tarball/master
+	source = OpenDDS.tar.gz::https://github.com/objectcomputing/OpenDDS/tarball/master
 	source = build.patch
-	source = tao-cosnaming.service
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 82faf0c3937f350a76b24e69b3ffa7e5
-	md5sums = 63fba1c486fb3ed8b216e0b456b50988
+	md5sums = 66375089cf36c73b540f1c180a8c2409
 
 pkgname = opendds-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..dca3572c3570
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.*
+/src
+/pkg
diff --git a/PKGBUILD b/PKGBUILD
index 40d7038d2f13..9ee734818eed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
-#
+# Maintainer: Fred Hornsey <hornseyf@objectcomputing.com>
+# Contributor: Brian Bidulock <bidulock@openss7.org>
+
 pkgname=opendds-git
-pkgver=3.5.1
+pkgver=3.13
 pkgrel=1
 pkgdesc="Open source C++ implementation of OMG Data Distribution Service (DDS)"
 arch=('i686' 'x86_64')
@@ -10,65 +11,42 @@ license=('custom')
 depends=('perl' 'bash')
 options=('!buildflags')
 makedepends=('git')
-install=opendds.install
 source=(
-    "MPC::git+https://github.com/bbidulock/MPC.git"
-    "ORB::git+https://github.com/bbidulock/Middleware.git"
-    "DDS::git+https://github.com/bbidulock/DDS.git"
+    "MPC.tar.gz::https://github.com/DOCGroup/MPC/tarball/master"
+    "ACE_TAO.tar.gz::https://github.com/DOCGroup/ACE_TAO/tarball/master"
+    "OpenDDS.tar.gz::https://github.com/objectcomputing/OpenDDS/tarball/master"
     build.patch
-    tao-cosnaming.service
     )
 md5sums=('SKIP'
          'SKIP'
          'SKIP'
-         '82faf0c3937f350a76b24e69b3ffa7e5'
-         '63fba1c486fb3ed8b216e0b456b50988')
+         '66375089cf36c73b540f1c180a8c2409')
 
 prepare() {
   cd "$srcdir"
-  patch -Np1 -b -z .orig -i build.patch
+  mv DOCGroup-ACE_TAO-* ACE_TAO
+  mv DOCGroup-MPC-* MPC
+  mv objectcomputing-OpenDDS-* OpenDDS
+  patch --strip=1 -i ../build.patch
 }
 
 build() {
-  cd DDS
-  export DOC_ROOT="$srcdir/ORB"
-  export ACE_ROOT="$DOC_ROOT/ACE"
-  export TAO_ROOT="$DOC_ROOT/TAO"
-  export CIAO_ROOT="$DOC_ROOT/CIAO"
-  export DANCE_ROOT="$DOC_ROOT/DAnCE"
-  export DDS_ROOT="$srcdir/DDS"
-  export MPC_ROOT="$srcdir/MPC"
-  export WIRESHARK_SRC="/usr/include/wiresharek"
-  export GLIB_ROOT="/usr"
-  export BOOST_ROOT="/usr"
-  export JAVA_HOME="/usr"
-  ./configure
-  make INSTALL_PREFIX="/usr"
+  cd "$srcdir/OpenDDS"
+  ./configure \
+    --mpc="$srcdir/MPC" \
+    --ace="$srcdir/ACE_TAO/ACE" \
+    --tao="$srcdir/ACE_TAO/TAO"
+  make
 }
 
 package() {
-  cd DDS
-  export DOC_ROOT="$srcdir/ORB"
-  export ACE_ROOT="$DOC_ROOT/ACE"
-  export TAO_ROOT="$DOC_ROOT/TAO"
-  export CIAO_ROOT="$DOC_ROOT/CIAO"
-  export DANCE_ROOT="$DOC_ROOT/DAnCE"
-  export DDS_ROOT="$srcdir/DDS"
-  export MPC_ROOT="$srcdir/MPC"
-  export WIRESHARK_SRC="/usr/include/wiresharek"
-  export GLIB_ROOT="/usr"
-  export BOOST_ROOT="/usr"
-  export JAVA_HOME="/usr"
-  sh ./setenv.sh
+  cd "$srcdir/OpenDDS"
+  source setenv.sh
   make INSTALL_PREFIX="/usr" DESTDIR="$pkgdir" install
   cd "$srcdir"
-  install -Dm644 ORB/ACE/rpmbuild/etc/tao/tao-cosnaming.conf "$pkgdir/etc/tao/tao-cosnaming.conf"
-  install -Dm644 ORB/ACE/rpmbuild/ace-tao-init-fedora/tao/tao-cosnaming.opt "$pkgdir/etc/tao/tao-cosnaming.opt"
-  install -Dm644 tao-cosnaming.service "$pkgdir/etc/systemd/system/tao-cosnaming.service"
-  install -dm755 "$pkgdir/usr/lib/tmpfiles.d"
-  printf 'd /run/tao 0750 tao tao\n' >"$pkgdir/usr/lib/tmpfiles.d/tao.conf"
-  install -Dm644 DDS/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.opendds"
-  install -Dm644 ORB/ACE/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE.docorb"
+  install -Dm644 "$DDS_ROOT/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/OpenDDS_LICENSE"
+  install -Dm644 "$ACE_ROOT/COPYING" "$pkgdir/usr/share/licenses/$pkgname/ACE_TAO_LICENSE"
+  # TODO Other licences
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/build.patch b/build.patch
index 0e6f865e14c4..3c80880dfb12 100644
--- a/build.patch
+++ b/build.patch
@@ -1,130 +1,22 @@
-diff -up src/DDS/dds/DdsDcps.mpc.orig src/DDS/dds/DdsDcps.mpc
---- src/DDS/dds/DdsDcps.mpc.orig	2014-09-25 16:14:52.000000000 -0600
-+++ src/DDS/dds/DdsDcps.mpc	2014-09-25 16:21:44.000000000 -0600
-@@ -202,8 +202,8 @@ project(OpenDDS_Dcps): taolib, core, cov
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(INSTALL_PREFIX)/share/dds/dds-devel.sh"
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/dds/dds"
--"	ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(INSTALL_PREFIX)/share/dds/dds"
-+"	echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
-+"	ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
-   }
- }
-diff -up src/DDS/dds/idl/opendds_idl.mpc.orig src/DDS/dds/idl/opendds_idl.mpc
---- src/DDS/dds/idl/opendds_idl.mpc.orig	2014-09-25 16:14:52.000000000 -0600
-+++ src/DDS/dds/idl/opendds_idl.mpc	2014-09-25 16:21:44.000000000 -0600
-@@ -30,8 +30,8 @@ project: aceexe, crosscompile, install {
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/dds/bin"
--"	ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(INSTALL_PREFIX)/share/dds/bin"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
-+"	ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
-   }
- 
- }
-diff -up src/ORB/CIAO/ccm/CCM_stub.mpc.orig src/ORB/CIAO/ccm/CCM_stub.mpc
---- src/ORB/CIAO/ccm/CCM_stub.mpc.orig	2014-09-25 16:12:04.000000000 -0600
-+++ src/ORB/CIAO/ccm/CCM_stub.mpc	2014-09-25 16:19:03.000000000 -0600
-@@ -140,7 +140,7 @@ project(CCM_stub) : install, ciaolib_wit
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	$(MKDIR) $(INSTALL_PREFIX)/share/ciao/ccm"
--"	ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(INSTALL_PREFIX)/share/ciao/ccm"
-+"	$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/ccm"
-+"	ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/ccm"
-   }
- }
-diff -up src/ORB/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc.orig src/ORB/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
---- src/ORB/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc.orig	2014-09-25 16:12:12.000000000 -0600
-+++ src/ORB/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc	2014-09-25 16:19:41.000000000 -0600
-@@ -22,7 +22,7 @@ project (CIAO_NDDS_idl_gen) : install, n
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/"
-+"	cp ndds_dcps_instance_handle.idl $(DESTDIR)$(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/"
-   }
- }
- 
-@@ -68,8 +68,8 @@ project (CIAO_NDDS_idl_install_only) {
- 
-   verbatim(gnuace, bottom) {
- "install:"
--"	$(MKDIR) $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
--"	cp *.idl $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-+"	$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-+"	cp *.idl $(DESTDIR)$(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds"
-   }
- 
- }
-diff -up src/ORB/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc.orig src/ORB/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
---- src/ORB/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc.orig	2014-09-25 16:12:46.000000000 -0600
-+++ src/ORB/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc	2014-09-25 16:20:08.000000000 -0600
-@@ -69,7 +69,7 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe,
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
--"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_idl2 $(INSTALL_PREFIX)/share/ace/bin"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-+"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_idl2 $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-   }
- }
-diff -up src/ORB/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc.orig src/ORB/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
---- src/ORB/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc.orig	2014-09-25 16:12:46.000000000 -0600
-+++ src/ORB/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc	2014-09-25 16:20:31.000000000 -0600
-@@ -64,7 +64,7 @@ project(CIAO_IDL3_TO_XMI_EXE) : aceexe,
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	@$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
--"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_xmi $(INSTALL_PREFIX)/share/ace/bin"
-+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-+"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_xmi $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
-   }
- }
-diff -up src/ORB/DAnCE/dance/DAnCE_Properties.mpc.orig src/ORB/DAnCE/dance/DAnCE_Properties.mpc
---- src/ORB/DAnCE/dance/DAnCE_Properties.mpc.orig	2014-09-25 16:12:47.000000000 -0600
-+++ src/ORB/DAnCE/dance/DAnCE_Properties.mpc	2014-09-25 16:21:11.000000000 -0600
-@@ -24,8 +24,8 @@ project(DAnCE_Properties_IDL) : install,
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	cp ../rules.dance.GNU $(INSTALL_PREFIX)/share/dance"
--"	perl -i -pe's!\\$$[{(]DANCE_ROOT[})]!$(INSTALL_PREFIX)/include!g;' $(INSTALL_PREFIX)/share/dance/rules.dance.GNU"
--"	echo export DANCE_ROOT=$(INSTALL_PREFIX)/share/dance> $(INSTALL_PREFIX)/share/dance/dance-devel.sh"
-+"	cp ../rules.dance.GNU $(DESTDIR)$(INSTALL_PREFIX)/share/dance"
-+"	perl -i -pe's!\\$$[{(]DANCE_ROOT[})]!$(INSTALL_PREFIX)/include!g;' $(DESTDIR)$(INSTALL_PREFIX)/share/dance/rules.dance.GNU"
-+"	echo export DANCE_ROOT=$(INSTALL_PREFIX)/share/dance> $(DESTDIR)$(INSTALL_PREFIX)/share/dance/dance-devel.sh"
-   }
- }
-diff -up src/ORB/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc.orig src/ORB/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc
---- src/ORB/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc.orig	2014-09-25 16:12:47.000000000 -0600
-+++ src/ORB/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc	2014-09-25 16:21:30.000000000 -0600
-@@ -34,6 +34,6 @@ project (DAnCE_LocalityManager_Exec) : d
-   }
- 
-   verbatim(gnuace, postinstall) {
--"	cp Locality_Manager_Task.cpp Locality_Manager.cpp Locality_Manager_Task.h $(INSTALL_PREFIX)/include/dance/LocalityManager/Daemon"
-+"	cp Locality_Manager_Task.cpp Locality_Manager.cpp Locality_Manager_Task.h $(DESTDIR)$(INSTALL_PREFIX)/include/dance/LocalityManager/Daemon"
-   }
- }
-diff -up src/ORB/TAO/TAO_IDL/tao_idl.mpc.orig src/ORB/TAO/TAO_IDL/tao_idl.mpc
---- src/ORB/TAO/TAO_IDL/tao_idl.mpc.orig	2014-09-25 16:13:02.000000000 -0600
-+++ src/ORB/TAO/TAO_IDL/tao_idl.mpc	2014-09-25 16:21:44.000000000 -0600
-@@ -36,7 +36,8 @@ project(TAO_IDL_EXE) : aceexe, install,
- "	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+--- src/OpenDDS/DDS_TAOv2.mwc.1
++++ src/OpenDDS/DDS_TAOv2.mwc
+@@ -24,7 +24,6 @@ workspace {
+   dds
+   tools
+   java
+-  DevGuideExamples
+ 
+   exclude {
+     java/jms
+--- src/ACE_TAO/TAO/TAO_IDL/tao_idl.mpc
++++ src/ACE_TAO/TAO/TAO_IDL/tao_idl.mpc
+@@ -42,7 +42,8 @@
  "	ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+ "ifeq ($(shared_libs),1)"
  "	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
 -"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
 +"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
 +"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+ "endif"
    }
  
-   Source_Files {
diff --git a/opendds.install b/opendds.install
deleted file mode 100644
index c2983adee690..000000000000
--- a/opendds.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install(){
-  # new password and equal group allocated in system range
-  usr/bin/getent passwd tao >/dev/null 2>&1 || \
-  usr/bin/useradd  -K SYS_UID_MIN=100 -K SYS_UID_MAX=499 \
-                   -K SYS_GID_MIN=100 -K SYS_GID_MAX=499 \
-                   -K USERGROUPS_ENAB=yes -r -U -d /run/tao -s /bin/false tao
-  true
-}
-
-post_remove(){
-  usr/bin/getent passwd tao >/dev/null 2>&1 && usr/bin/userdel  tao
-  usr/bin/getent group  tao >/dev/null 2>&1 && usr/bin/groupdel tao
-  true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/tao-cosnaming.service b/tao-cosnaming.service
deleted file mode 100644
index e5f46bc79442..000000000000
--- a/tao-cosnaming.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=TAO Naming Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/tao/tao-cosnaming.pid
-EnvironmentFile=/etc/tao/tao-cosnaming.opt
-User=tao
-Group=tao
-ExecStart=/usr/bin/tao_cosnaming -p /run/tao/tao-cosnaming.pid $OPTIONS -ORBSvcConf /etc/tao/tao-cosnaming.conf -ORBDaemon
-
-[Install]
-WantedBy=multi-user.target