From owner-svn-ports-all@FreeBSD.ORG  Wed Aug  6 06:39:22 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 67C42C7C
 for <svn-ports-all@freebsd.org>; Wed,  6 Aug 2014 06:39:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D79C27CD
 for <svn-ports-all@freebsd.org>; Wed,  6 Aug 2014 06:39:22 +0000 (UTC)
Received: from hrs (uid 837) (envelope-from hrs@FreeBSD.org) id 5377
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 06:39:21 +0000
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 6 Aug 2014 06:39:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364153 - in head/security/trousers: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e1cd9a.5377.1e39c239@svn.freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 06:39:22 -0000

Author: hrs
Date: Wed Aug  6 06:39:21 2014
New Revision: 364153
URL: http://svnweb.freebsd.org/changeset/ports/364153
QAT: https://qat.redports.org/buildarchive/r364153/

Log:
  Remove reference to my_init and my_fini.  These functions were causing
  symbol conflicts with other software like MySQL.
  
  PR:	192156

Modified:
  head/security/trousers/Makefile
  head/security/trousers/files/patch-src-tspi-rpc-hosttable.c

Modified: head/security/trousers/Makefile
==============================================================================
--- head/security/trousers/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
+++ head/security/trousers/Makefile	Wed Aug  6 06:39:21 2014	(r364153)
@@ -3,7 +3,7 @@
 
 PORTNAME=	trousers
 PORTVERSION=	0.3.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 

Modified: head/security/trousers/files/patch-src-tspi-rpc-hosttable.c
==============================================================================
--- head/security/trousers/files/patch-src-tspi-rpc-hosttable.c	Wed Aug  6 04:34:23 2014	(r364152)
+++ head/security/trousers/files/patch-src-tspi-rpc-hosttable.c	Wed Aug  6 06:39:21 2014	(r364153)
@@ -1,6 +1,6 @@
---- src/tspi/rpc/hosttable.c.orig	2010-05-02 11:39:11.000000000 +0900
-+++ src/tspi/rpc/hosttable.c	2010-10-24 21:04:04.845560543 +0900
-@@ -36,8 +36,8 @@
+--- src/tspi/rpc/hosttable.c.orig	2012-09-20 02:35:07.000000000 +0900
++++ src/tspi/rpc/hosttable.c	2014-08-06 15:35:22.000000000 +0900
+@@ -36,10 +36,10 @@
  }
  
  #ifdef SOLARIS
@@ -9,8 +9,11 @@
 +#pragma init(_init_hosttable)
 +void _init_hosttable(void)
  #else
- void __attribute__ ((constructor)) my_init(void)
+-void __attribute__ ((constructor)) my_init(void)
++static void __attribute__ ((constructor)) my_init(void)
  #endif
+ {
+ 	host_table_init();
 @@ -51,6 +51,8 @@
  {
  	struct host_table_entry *hte, *next = NULL;
@@ -20,7 +23,7 @@
  	MUTEX_LOCK(ht->lock);
  
  	for (hte = ht->entries; hte; hte = next) {
-@@ -70,8 +72,8 @@
+@@ -70,10 +72,10 @@
  }
  
  #ifdef SOLARIS
@@ -29,8 +32,11 @@
 +#pragma fini(_fini_hosttable)
 +void _fini_hosttable(void)
  #else
- void __attribute__ ((destructor)) my_fini(void)
+-void __attribute__ ((destructor)) my_fini(void)
++static void __attribute__ ((destructor)) my_fini(void)
  #endif
+ {
+ 	host_table_final();
 @@ -84,6 +86,8 @@
  {
  	struct host_table_entry *entry, *tmp;