Attachment #148584 for bug #194559




# $FreeBSD$

PORTNAME=	mico
PORTVERSION=	2.3.13
PORTREVISION=	4
CATEGORIES=	devel
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/

PATCH_SITES=	http://mico.org/errata/
PATCHFILES=	mico-2.3.12-secfix1.diff

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Secure, reliable, production-quality, standards-based CORBA middleware

LICENSE=	GPLv2
EXPIRATION_DATE=	2013-12-22

USES=	gmake
USE_AUTOTOOLS=		autoconf

USE_LDCONFIG=		yes
WRKSRC=			${WRKDIR}/${PORTNAME}
USE_LDCONFIG=		yes
GNU_CONFIGURE=		yes
USE_GMAKE=		yes
USE_AUTOTOOLS=		autoconf
CONFIGURE_ENV+=		EGREP=`which egrep`

OPTIONS_DEFINE=	SERVICES SSL X11 GTK1 DEBUG TCL DOCS

GTK1_DESC=	Build with GTK1 support
TCL_DESC=	Build with TCL support

NO_STAGE=	yes
.include <bsd.port.options.mk>

NOT_FOR_ARCHS=		sparc64

MICO_SSL=		"@comment "
.else
USE_OPENSSL=		yes
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
CONFIGURE_ARGS+=	--enable-csiv2 --enable-csl2
.endif

PLIST_SUB+=	MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \

	@${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile
	@${RM} -f ${WRKSRC}/include/mico/*.orig ${WRKSRC}/include/coss/*.orig

pre-install:
	@${REINPLACE_CMD} -e "s#${PREFIX}#${STAGEDIR}${PREFIX}#" ${WRKSRC}/MakeVars

post-install:
	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \
		${LN} -fs ${STAGEDIR}${PREFIX}/$$i ${STAGEDIR}${PREFIX}/$$i.1; \
	done; \
	for i in `${GREP} ^bin/ ${TMPPLIST}`; do \
		(${STRIP_CMD} ${STAGEDIR}${PREFIX}/$$i || ${TRUE}) 2> /dev/null; \
	done
.if ${PORT_OPTIONS:MDOCS}
	${GMAKE} -C ${WRKSRC} install-doc

Lines 1-4 Link Here

(-)devel/mico/distinfo (-4 / +2 lines)
1	SHA256 (mico-2.3.12.tar.gz) = f67663962c0fabfb459e0c14027fcd3ab9d809ba69cabdf9399abe467b9bbf4f	1	SHA256 (mico-2.3.13.tar.gz) = a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
2	SIZE (mico-2.3.12.tar.gz) = 2837502	2	SIZE (mico-2.3.13.tar.gz) = 3269814
3	SHA256 (mico-2.3.12-secfix1.diff) = c1127b2afebb57bec2f89cd6ea427038c3667c2a39ffbf8243d1de1b0ccc9457
4	SIZE (mico-2.3.12-secfix1.diff) = 547




--- Makefile.orig	2008-07-25 08:41:44.000000000 -0500
+++ Makefile	2014-10-17 18:40:51.000000000 -0500
@@ -33,7 +33,7 @@
 endif
 EXTRADIRS = test demo
 ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo
-INSTALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm tools include man demo

 # Bootstrap minimal build configuration
 MINLIBDIRS = orb ir idl
 MINPRGDIRS = cpp idl
@@ -75,11 +75,13 @@
 
 install:
 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install || exit 1; done

+		$(IDIRCMD) $(SHARED_INSTDIR)/share/doc/mico; \
+		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/share/doc/mico/manual.ps; \
 	fi
-	$(LDCONFIG)
 
 install-cd:
 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done




--- ccm/componentserver.cc.orig	2014-10-17 20:39:04.000000000 -0500
+++ ccm/componentserver.cc	2014-10-17 20:40:17.000000000 -0500
@@ -37,8 +37,8 @@
 CORBA::ORB_var orb;
 PortableServer::POA_var poa;
 #ifdef HAVE_THREADS
-MICOMT::Mutex mutex;
-MICOMT::CondVar cond(&mutex);
+MICOMT::Mutex mico_mutex;
+MICOMT::CondVar cond(&mico_mutex);
 #else // HAVE_THREADS
 bool finished;
 #endif // HAVE_THREADS
@@ -575,7 +575,7 @@
 public:
     void _run(void*)
     {
-	MICOMT::AutoLock t_lock(mutex);
+	MICOMT::AutoLock t_lock(mico_mutex);
 	cond.wait();
 	csimpl->remove();
 	poa->destroy (1, 1);




--- ./orb/security/audit_impl.cc.orig	2014-10-17 19:05:46.000000000 -0500
+++ ./orb/security/audit_impl.cc	2014-10-17 19:09:16.000000000 -0500
@@ -403,9 +403,9 @@
 
 #endif
 
-MICOSL2::ConsoleArchive::ConsoleArchive(int priority = 0)
+MICOSL2::ConsoleArchive::ConsoleArchive(int priority)
 {
-    priority_ = priority;
+    priority_ = priority = 0;
 }
 
 MICOSL2::ConsoleArchive::~ConsoleArchive()

Lines 133-140 Link Here

(-)devel/mico/pkg-plist (-201 / +90 lines)
133	include/mico/impl.h	133	include/mico/impl.h
134	include/mico/imr.h	134	include/mico/imr.h
135	include/mico/imr.idl	135	include/mico/imr.idl
136	include/mico/intercept.h
137	include/mico/intercept.idl
138	include/mico/iop.h	136	include/mico/iop.h
139	include/mico/ioptypes.h	137	include/mico/ioptypes.h
140	include/mico/ioptypes.idl	138	include/mico/ioptypes.idl
Lines 152-160 Link Here
152	include/mico/magic.h	150	include/mico/magic.h
153	include/mico/memtrace.h	151	include/mico/memtrace.h
154	include/mico/message.h	152	include/mico/message.h
		153	include/mico/messaging.h
		154	include/mico/messaging.idl
		155	include/mico/messaging_impl.h
155	include/mico/mt_dispatcher.h	156	include/mico/mt_dispatcher.h
156	include/mico/mt_manager.h	157	include/mico/mt_manager.h
157	include/mico/mtdebug.h	158	include/mico/mtdebug.h
		159	include/mico/mtpolicy.h
		160	include/mico/mtpolicy.idl
		161	include/mico/mtpolicy_impl.h
		162	include/mico/mttypes.h
		163	include/mico/mttypes.idl
158	include/mico/native.h	164	include/mico/native.h
159	include/mico/object.h	165	include/mico/object.h
160	include/mico/operation.h	166	include/mico/operation.h
Lines 209-214 Link Here
209	include/mico/security/SecurityAdmin.idl	215	include/mico/security/SecurityAdmin.idl
210	include/mico/security/SecurityAdmin_impl.h	216	include/mico/security/SecurityAdmin_impl.h
211	include/mico/security/access_impl.h	217	include/mico/security/access_impl.h
		218	include/mico/security/acext.asn1
		219	include/mico/security/acext.h
		220	include/mico/security/atlas.h
		221	include/mico/security/atlas.idl
212	include/mico/security/audit_impl.h	222	include/mico/security/audit_impl.h
213	include/mico/security/csi.h	223	include/mico/security/csi.h
214	include/mico/security/csi.idl	224	include/mico/security/csi.idl
Lines 232-237 Link Here
232	include/mico/security/securitylevel2.h	242	include/mico/security/securitylevel2.h
233	include/mico/security/securitylevel2.idl	243	include/mico/security/securitylevel2.idl
234	include/mico/security/securitylevel2_impl.h	244	include/mico/security/securitylevel2_impl.h
		245	include/mico/security/securitylevel3.h
		246	include/mico/security/securitylevel3.idl
		247	include/mico/security/securitylevel3_impl.h
		248	include/mico/security/sl3ac.h
		249	include/mico/security/sl3aqargs.h
		250	include/mico/security/sl3aqargs.idl
		251	include/mico/security/sl3aqargs_impl.h
		252	include/mico/security/sl3aqargs_p.h
		253	include/mico/security/sl3aqargs_p.idl
		254	include/mico/security/sl3aqargs_p_impl.h
		255	include/mico/security/sl3authorization.h
		256	include/mico/security/sl3authorization.idl
		257	include/mico/security/sl3cm.h
		258	include/mico/security/sl3cm.idl
		259	include/mico/security/sl3cmdext.h
		260	include/mico/security/sl3csi.h
		261	include/mico/security/sl3csi.idl
		262	include/mico/security/sl3csi_impl.h
		263	include/mico/security/sl3ipc.h
		264	include/mico/security/sl3ipc.idl
		265	include/mico/security/sl3ipc_impl.h
		266	include/mico/security/sl3om.h
		267	include/mico/security/sl3om.idl
		268	include/mico/security/sl3omext.h
		269	include/mico/security/sl3omext.idl
		270	include/mico/security/sl3pm.h
		271	include/mico/security/sl3pm.idl
		272	include/mico/security/sl3pm_impl.h
		273	include/mico/security/sl3tcpip.h
		274	include/mico/security/sl3tcpip.idl
		275	include/mico/security/sl3tcpip_impl.h
		276	include/mico/security/sl3tls.h
		277	include/mico/security/sl3tls.idl
		278	include/mico/security/sl3tls_impl.h
		279	include/mico/security/sl3utils.h
		280	include/mico/security/transportsecurity.h
		281	include/mico/security/transportsecurity.idl
		282	include/mico/security/transportsecurity_impl.h
		283	include/mico/security/transportsecurity_p.h
		284	include/mico/security/transportsecurity_p.idl
		285	include/mico/security/trust.h
		286	include/mico/security/trust.idl
		287	include/mico/security/userpassword.h
		288	include/mico/security/userpassword.idl
235	include/mico/select_dispatcher.h	289	include/mico/select_dispatcher.h
236	include/mico/sequence.h	290	include/mico/sequence.h
237	include/mico/sequence_special.h	291	include/mico/sequence_special.h
Lines 271-305 Link Here
271	include/mico/valuetype_impl.h	325	include/mico/valuetype_impl.h
272	include/mico/version.h	326	include/mico/version.h
273	include/mico/x11.h	327	include/mico/x11.h
274	lib/libmico2.3.12.a	328	lib/libmico2.3.13.a
275	lib/libmico2.3.12.so	329	lib/libmico2.3.13.so
276	lib/libmico2.3.12.so.1	330	lib/libmico2.3.13.so.1
277	lib/libmicoaux2.3.12.a	331	lib/libmicoaux2.3.13.a
278	lib/libmicoaux2.3.12.so	332	lib/libmicoaux2.3.13.so
279	lib/libmicoaux2.3.12.so.1	333	lib/libmicoaux2.3.13.so.1
280	%%MICO_SERVICE%%lib/libmicoccm2.3.12.a	334	%%MICO_SERVICE%%lib/libmicoccm2.3.13.a
281	%%MICO_SERVICE%%lib/libmicoccm2.3.12.so	335	%%MICO_SERVICE%%lib/libmicoccm2.3.13.so
282	%%MICO_SERVICE%%lib/libmicoccm2.3.12.so.1	336	%%MICO_SERVICE%%lib/libmicoccm2.3.13.so.1
283	%%MICO_SERVICE%%lib/libmicocoss2.3.12.a	337	%%MICO_SERVICE%%lib/libmicocoss2.3.13.a
284	%%MICO_SERVICE%%lib/libmicocoss2.3.12.so	338	%%MICO_SERVICE%%lib/libmicocoss2.3.13.so
285	%%MICO_SERVICE%%lib/libmicocoss2.3.12.so.1	339	%%MICO_SERVICE%%lib/libmicocoss2.3.13.so.1
286	%%MICO_GTK%%lib/libmicogtk2.3.12.a	340	%%MICO_GTK%%lib/libmicogtk2.3.13.a
287	%%MICO_GTK%%lib/libmicogtk2.3.12.so	341	%%MICO_GTK%%lib/libmicogtk2.3.13.so
288	%%MICO_GTK%%lib/libmicogtk2.3.12.so.1	342	%%MICO_GTK%%lib/libmicogtk2.3.13.so.1
289	lib/libmicoir2.3.12.a	343	lib/libmicoir2.3.13.a
290	lib/libmicoir2.3.12.so	344	lib/libmicoir2.3.13.so
291	lib/libmicoir2.3.12.so.1	345	lib/libmicoir2.3.13.so.1
292	%%MICO_QT%%lib/libmicoqt2.3.12.a	346	%%MICO_QT%%lib/libmicoqt2.3.13.a
293	%%MICO_QT%%lib/libmicoqt2.3.12.so	347	%%MICO_QT%%lib/libmicoqt2.3.13.so
294	%%MICO_QT%%lib/libmicoqt2.3.12.so.1	348	%%MICO_QT%%lib/libmicoqt2.3.13.so.1
295	%%MICO_TCL%%lib/libmicotcl2.3.12.a	349	%%MICO_TCL%%lib/libmicotcl2.3.13.a
296	%%MICO_TCL%%lib/libmicotcl2.3.12.so	350	%%MICO_TCL%%lib/libmicotcl2.3.13.so
297	%%MICO_TCL%%lib/libmicotcl2.3.12.so.1	351	%%MICO_TCL%%lib/libmicotcl2.3.13.so.1
298	%%MICO_X11%%lib/libmicox2.3.12.a	352	%%MICO_X11%%lib/libmicox2.3.13.a
299	%%MICO_X11%%lib/libmicox2.3.12.so	353	%%MICO_X11%%lib/libmicox2.3.13.so
300	%%MICO_X11%%lib/libmicox2.3.12.so.1	354	%%MICO_X11%%lib/libmicox2.3.13.so.1
301	lib/mico-setup.csh	355	lib/mico-setup.csh
302	lib/mico-setup.sh	356	lib/mico-setup.sh
		357	man/man1/idl.1.gz
		358	man/man1/imr.1.gz
		359	man/man1/nsadmin.1.gz
		360	man/man5/micorc.5.gz
		361	man/man8/ird.8.gz
		362	man/man8/micod.8.gz
		363	man/man8/nsd.8.gz
303	%%PORTDOCS%%%%DOCSDIR%%/manual.ps	364	%%PORTDOCS%%%%DOCSDIR%%/manual.ps
304	%%PORTDOCS%%%%EXAMPLESDIR%%/MakeVars	365	%%PORTDOCS%%%%EXAMPLESDIR%%/MakeVars
305	%%PORTDOCS%%%%EXAMPLESDIR%%/README	366	%%PORTDOCS%%%%EXAMPLESDIR%%/README
Lines 441-451 Link Here
441	%%PORTDOCS%%%%EXAMPLESDIR%%/generic/test_cases	502	%%PORTDOCS%%%%EXAMPLESDIR%%/generic/test_cases
442	%%PORTDOCS%%%%EXAMPLESDIR%%/henning/README	503	%%PORTDOCS%%%%EXAMPLESDIR%%/henning/README
443	%%PORTDOCS%%%%EXAMPLESDIR%%/henning/diffs	504	%%PORTDOCS%%%%EXAMPLESDIR%%/henning/diffs
444	%%PORTDOCS%%%%EXAMPLESDIR%%/interceptor/Makefile
445	%%PORTDOCS%%%%EXAMPLESDIR%%/interceptor/client.cc
446	%%PORTDOCS%%%%EXAMPLESDIR%%/interceptor/hello.idl
447	%%PORTDOCS%%%%EXAMPLESDIR%%/interceptor/runit
448	%%PORTDOCS%%%%EXAMPLESDIR%%/interceptor/server.cc
449	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/Makefile	505	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/Makefile
450	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/README	506	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/README
451	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/jacorb/Account.idl	507	%%PORTDOCS%%%%EXAMPLESDIR%%/interop/jacorb/Account.idl
Lines 663-824 Link Here
663	%%PORTDOCS%%%%EXAMPLESDIR%%/random/Makefile	719	%%PORTDOCS%%%%EXAMPLESDIR%%/random/Makefile
664	%%PORTDOCS%%%%EXAMPLESDIR%%/random/client.cc	720	%%PORTDOCS%%%%EXAMPLESDIR%%/random/client.cc
665	%%PORTDOCS%%%%EXAMPLESDIR%%/random/random.idl	721	%%PORTDOCS%%%%EXAMPLESDIR%%/random/random.idl
666	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/Makefile
667	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/README
668	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/Makefile
669	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/README
670	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/ServerCert.pem
671	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/ServerKey.pem
672	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/account.idl
673	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/audit.cnf
674	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/client.cc
675	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/client2.cc
676	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/config.cnf
677	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/key.pem
678	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/manager.pem
679	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/owner.pem
680	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/rcs
681	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/rss
682	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/run
683	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/server.cc
684	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/wife.pem
685	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/Makefile
686	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/ODM.cnf
687	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/README
688	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/access.cnf
689	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/account.idl
690	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/audit.cnf
691	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/ca_cert.pem
692	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/client.cc
693	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/client2.cc
694	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/manager_cert.pem
695	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/manager_key.pem
696	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/owner_cert.pem
697	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/owner_key.pem
698	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/rights.cnf
699	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/run
700	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/s_cert.pem
701	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/s_key.pem
702	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/server.cc
703	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/wife_cert.pem
704	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/wife_key.pem
705	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/wife_self_cert.pem
706	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware-ca-check/wife_self_key.pem
707	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/Makefile
708	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/ODM.cnf
709	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/README
710	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/ServerCert.pem
711	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/ServerKey.pem
712	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/access.cnf
713	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/account.idl
714	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/audit.cnf
715	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/client.cc
716	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/client2.cc
717	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/key.pem
718	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/manager.pem
719	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/owner.pem
720	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rcs
721	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rcs1
722	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rcs2
723	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rights.cnf
724	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rss
725	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/rss1
726	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/run
727	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/server.cc
728	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-unaware/wife.pem
729	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/Makefile
730	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/ODM.cnf
731	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/README
732	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/README.Audit
733	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/ServerCert.pem
734	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/ServerKey.pem
735	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/access.cnf
736	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/account.idl
737	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/client.cc
738	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/client2.cc
739	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/config.cnf
740	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/key.pem
741	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/manager.pem
742	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/owner.pem
743	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/rcs
744	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/rights.cnf
745	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/rsnd
746	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/rss
747	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/rst
748	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/run
749	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/server.cc
750	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-aware/wife.pem
751	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/ClientCert.pem
752	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/ClientKey.pem
753	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/Makefile
754	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/README
755	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/ServerCert.pem
756	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/ServerKey.pem
757	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/client.cc
758	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/hello.idl
759	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/rcs
760	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/rss
761	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/run
762	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/runit
763	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/server.cc
764	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-book/ssl
765	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/Makefile
766	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/ODM.cnf
767	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/README
768	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/ServerCert.pem
769	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/ServerKey.pem
770	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/access.cnf
771	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/account.idl
772	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/audit.cnf
773	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/client.cc
774	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/client2.cc
775	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/key.pem
776	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/manager.pem
777	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/owner.pem
778	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/rcs
779	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/rights.cnf
780	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/rss
781	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/run
782	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/server.cc
783	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/audit-unaware/wife.pem
784	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/ClientCert.pem
785	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/ClientKey.pem
786	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/Makefile
787	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/ServerCert.pem
788	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/ServerKey.pem
789	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/account.idl
790	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/client.cc
791	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/rcs
792	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/rss
793	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/run
794	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/server.cc
795	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l1/ssl
796	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/ClientCert.pem
797	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/ClientKey.pem
798	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/Makefile
799	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/ServerCert.pem
800	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/ServerKey.pem
801	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/account.idl
802	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/client.cc
803	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/list.pem
804	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/rcs
805	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/rss
806	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/run
807	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/server.cc
808	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/l2/ssl
809	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/ClientCert.pem
810	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/ClientKey.pem
811	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/Makefile
812	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/ServerCert.pem
813	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/ServerKey.pem
814	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/account.idl
815	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/client.cc
816	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/list.pem
817	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/rcs
818	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/rss
819	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/run
820	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/server.cc
821	%%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/tutorial/ssl
822	%%PORTDOCS%%%%EXAMPLESDIR%%/services/Makefile	722	%%PORTDOCS%%%%EXAMPLESDIR%%/services/Makefile
823	%%PORTDOCS%%%%EXAMPLESDIR%%/services/README	723	%%PORTDOCS%%%%EXAMPLESDIR%%/services/README
824	%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/events/Makefile	724	%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/events/Makefile
Lines 872-887 Link Here
872	%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/naming	772	%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/naming
873	%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/events	773	%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/events
874	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/services	774	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/services
875	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/tutorial
876	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/l2
877	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/l1
878	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/audit-unaware
879	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/audit-book
880	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/audit-aware
881	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/acl-unaware-ca-check
882	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/acl-unaware
883	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/acl-aware
884	%%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security
885	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/random	775	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/random
886	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/inherit	776	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/inherit
887	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/hello-2	777	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/hello-2
Lines 936-942 Link Here
936	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/jboss	826	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/jboss
937	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/jacorb	827	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/jacorb
938	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop	828	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop
939	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interceptor
940	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/henning	829	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/henning
941	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/generic	830	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/generic
942	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/dynany	831	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/dynany

Return to bug 194559

Lines 2-29 Link Here

(-)devel/mico/Makefile (-17 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mico	4	PORTNAME= mico
5	PORTVERSION= 2.3.12	5	PORTVERSION= 2.3.13
6	PORTREVISION= 4
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
9		8
10	PATCH_SITES= http://mico.org/errata/
11	PATCHFILES= mico-2.3.12-secfix1.diff
12
13	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Secure, reliable, production-quality, standards-based CORBA middleware	10	COMMENT= Secure, reliable, production-quality, standards-based CORBA middleware
15		11
16	DEPRECATED= Broken for more than 6 month	12	LICENSE= GPLv2
17	EXPIRATION_DATE= 2013-12-22
18		13
19	BROKEN= fails to build	14	USES= gmake
		15	USE_AUTOTOOLS= autoconf
20		16
21	PATCH_DIST_STRIP= -p1	17	USE_LDCONFIG= yes
22	WRKSRC= ${WRKDIR}/${PORTNAME}	18	WRKSRC= ${WRKDIR}/${PORTNAME}
23	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
25	USE_GMAKE= yes
26	USE_AUTOTOOLS= autoconf
27	CONFIGURE_ENV+= EGREP=`which egrep`	20	CONFIGURE_ENV+= EGREP=`which egrep`
28		21
29	OPTIONS_DEFINE= SERVICES SSL X11 GTK1 DEBUG TCL DOCS	22	OPTIONS_DEFINE= SERVICES SSL X11 GTK1 DEBUG TCL DOCS
Lines 32-38 Link Here
32	GTK1_DESC= Build with GTK1 support	25	GTK1_DESC= Build with GTK1 support
33	TCL_DESC= Build with TCL support	26	TCL_DESC= Build with TCL support
34		27
35	NO_STAGE= yes
36	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
37		29
38	NOT_FOR_ARCHS= sparc64	30	NOT_FOR_ARCHS= sparc64
Lines 78-85 Link Here
78	MICO_SSL= "@comment "	70	MICO_SSL= "@comment "
79	.else	71	.else
80	USE_OPENSSL= yes	72	USE_OPENSSL= yes
81	CONFIGURE_ARGS+= --enable-ssl=${OPENSSLBASE}	73	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
82	CONFIGURE_ARGS+= --enable-csiv2 --enable-csl2
83	.endif	74	.endif
84		75
85	PLIST_SUB+= MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \	76	PLIST_SUB+= MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \
Lines 100-111 Link Here
100	@${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile	91	@${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile
101	@${RM} -f ${WRKSRC}/include/mico/.orig ${WRKSRC}/include/coss/.orig	92	@${RM} -f ${WRKSRC}/include/mico/.orig ${WRKSRC}/include/coss/.orig
102		93
		94	pre-install:
		95	@${REINPLACE_CMD} -e "s#${PREFIX}#${STAGEDIR}${PREFIX}#" ${WRKSRC}/MakeVars
		96
103	post-install:	97	post-install:
104	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \	98	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \
105	${LN} -fs ${PREFIX}/$$i ${PREFIX}/$$i.1; \	99	${LN} -fs ${STAGEDIR}${PREFIX}/$$i ${STAGEDIR}${PREFIX}/$$i.1; \
106	done; \	100	done; \
107	for i in `${GREP} ^bin/ ${TMPPLIST}`; do \	101	for i in `${GREP} ^bin/ ${TMPPLIST}`; do \
108	(${STRIP_CMD} ${PREFIX}/$$i \|\| ${TRUE}) 2> /dev/null; \	102	(${STRIP_CMD} ${STAGEDIR}${PREFIX}/$$i \|\| ${TRUE}) 2> /dev/null; \
109	done	103	done
110	.if ${PORT_OPTIONS:MDOCS}	104	.if ${PORT_OPTIONS:MDOCS}
111	${GMAKE} -C ${WRKSRC} install-doc	105	${GMAKE} -C ${WRKSRC} install-doc

Lines 1-7 Link Here

(-)devel/mico/files/patch-Makefile (-6 / +6 lines)
1	--- Makefile.orig Fri Feb 14 13:55:53 2003	1	--- Makefile.orig 2008-07-25 08:41:44.000000000 -0500
2	+++ Makefile Sun Jun 29 13:49:37 2003	2	+++ Makefile 2014-10-17 18:40:51.000000000 -0500
3	@@ -27,7 +27,7 @@	3	@@ -33,7 +33,7 @@
4	PRGDIRS = orb ir cpp idl daemon auxdir coss ccm tools	4	endif
5	EXTRADIRS = test demo	5	EXTRADIRS = test demo
6	ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo	6	ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo
7	-INSTALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm tools include man demo	7	-INSTALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm tools include man demo
Lines 9-15 Link Here
9	# Bootstrap minimal build configuration	9	# Bootstrap minimal build configuration
10	MINLIBDIRS = orb ir idl	10	MINLIBDIRS = orb ir idl
11	MINPRGDIRS = cpp idl	11	MINPRGDIRS = cpp idl
12	@@ -68,11 +68,13 @@	12	@@ -75,11 +75,13 @@
13		13
14	install:	14	install:
15	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install \|\| exit 1; done	15	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install \|\| exit 1; done
Lines 22-28 Link Here
22	+ $(IDIRCMD) $(SHARED_INSTDIR)/share/doc/mico; \	22	+ $(IDIRCMD) $(SHARED_INSTDIR)/share/doc/mico; \
23	+ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/share/doc/mico/manual.ps; \	23	+ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/share/doc/mico/manual.ps; \
24	fi	24	fi
25	- -ldconfig	25	- $(LDCONFIG)
26		26
27	install-cd:	27	install-cd:
28	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd \|\| exit 1; done	28	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd \|\| exit 1; done

Line 0 Link Here

(-)devel/mico/files/patch-ccm-componentserver.cc (+22 lines)
	1	--- ccm/componentserver.cc.orig 2014-10-17 20:39:04.000000000 -0500
	2	+++ ccm/componentserver.cc 2014-10-17 20:40:17.000000000 -0500
	3	@@ -37,8 +37,8 @@
	4	CORBA::ORB_var orb;
	5	PortableServer::POA_var poa;
	6	#ifdef HAVE_THREADS
	7	-MICOMT::Mutex mutex;
	8	-MICOMT::CondVar cond(&mutex);
	9	+MICOMT::Mutex mico_mutex;
	10	+MICOMT::CondVar cond(&mico_mutex);
	11	#else // HAVE_THREADS
	12	bool finished;
	13	#endif // HAVE_THREADS
	14	@@ -575,7 +575,7 @@
	15	public:
	16	void _run(void*)
	17	{
	18	- MICOMT::AutoLock t_lock(mutex);
	19	+ MICOMT::AutoLock t_lock(mico_mutex);
	20	cond.wait();
	21	csimpl->remove();
	22	poa->destroy (1, 1);

Line 0 Link Here

(-)devel/mico/files/patch-orb-security-audit_impl.cc (+14 lines)
	1	--- ./orb/security/audit_impl.cc.orig 2014-10-17 19:05:46.000000000 -0500
	2	+++ ./orb/security/audit_impl.cc 2014-10-17 19:09:16.000000000 -0500
	3	@@ -403,9 +403,9 @@
	4
	5	#endif
	6
	7	-MICOSL2::ConsoleArchive::ConsoleArchive(int priority = 0)
	8	+MICOSL2::ConsoleArchive::ConsoleArchive(int priority)
	9	{
	10	- priority_ = priority;
	11	+ priority_ = priority = 0;
	12	}
	13
	14	MICOSL2::ConsoleArchive::~ConsoleArchive()