svn commit: r364153 - in head/security/trousers: . files
Hiroki Sato
hrs at FreeBSD.org
Wed Aug 6 06:39:22 UTC 2014
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;
More information about the svn-ports-all
mailing list