Date: Tue, 06 Sep 2011 09:16:10 +0400 From: h h <aakuusta@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/160502: [patch] net-p2p/mldonkey: update to 3.1.0 (10 Aug) Message-ID: <86y5y28d45.fsf@gmail.com> Resent-Message-ID: <201109060520.p865K16G081482@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160502
>Category: ports
>Synopsis: [patch] net-p2p/mldonkey: update to 3.1.0 (10 Aug)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 06 05:20:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: h h
>Release: FreeBSD 9.0-BETA2 r225402M amd64
>Organization:
>Environment:
$ cat 7.3-RELEASE/base/base.?? | tar tvf - | fgrep pthread.so
lrwxr-xr-x 0 root wheel 0 Mar 21 2010 ./usr/lib/libpthread.so -> libthr.so
>Description:
- update
- garbage collect OBE thread flags:
-lthr is now default, -lkse and -lc_r are long gone
mldonkey now defines GETHOSTBYNAME_IS_REENTRANT
- make clang happy by ports/160498, sync with vendor
http://cvs.savannah.gnu.org/viewvc/mldonkey/src/utils/lib/CryptoPP.h?root=mldonkey&r1=1.9&r2=1.10
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: net-p2p/mldonkey/Makefile
===================================================================
RCS file: /a/.csup/ports/net-p2p/mldonkey/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- net-p2p/mldonkey/Makefile 24 Jul 2011 18:05:23 -0000 1.85
+++ net-p2p/mldonkey/Makefile 6 Sep 2011 05:14:05 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= mldonkey
-PORTVERSION= 3.0.7
+PORTVERSION= 3.1.0
CATEGORIES+= net-p2p
MASTER_SITES= SF
@@ -39,8 +39,6 @@ CONFIGURE_ENV+= \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
-# FreeBSD has reentrant dns code
-PTHREAD_CFLAGS+= -D_REENTRANT
###
## Library dependency handling
@@ -113,27 +111,12 @@ ALL_TARGET+= \
.include <bsd.port.pre.mk>
-### Development version
-## Thus, we will use non standard threading library
-## We will switch from libpthread to libthr which should produce
-## better results in some scenarios. You can read more at pthread(3)
-.if defined(WITH_THR_THREAD_MODEL)
-PTHREAD_CFLAGS= -D_THREAD_SAFE
-PTHREAD_LIBS= -lthr
-.endif
-
pre-everything::
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
@${ECHO_MSG}
.endif
-.ifndef(WITH_THR_THREAD_MODEL)
- @${ECHO_MSG} "Define WITH_THR_THREAD_MODEL to switch from"
- @${ECHO_MSG} "pthread to thr threading model which could produce better"
- @${ECHO_MSG} "results in some scenarios. Use at your discretion."
-
-.endif
post-patch:
@${SED} \
@@ -143,6 +126,7 @@ post-patch:
${WRKDIR}/wrapper.sh
@${REINPLACE_CMD} -E \
-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
+ -e 's/-O6//' \
${BUILD_WRKSRC}/config/Makefile.in
# update server.met provider
.for file in \
Index: net-p2p/mldonkey/distinfo
===================================================================
RCS file: /a/.csup/ports/net-p2p/mldonkey/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- net-p2p/mldonkey/distinfo 20 Jul 2011 02:45:01 -0000 1.34
+++ net-p2p/mldonkey/distinfo 6 Sep 2011 04:40:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (mldonkey-3.0.7.tar.bz2) = 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4
-SIZE (mldonkey-3.0.7.tar.bz2) = 2799555
+SHA256 (mldonkey-3.1.0.tar.bz2) = fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
+SIZE (mldonkey-3.1.0.tar.bz2) = 2820081
Index: net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
===================================================================
RCS file: net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
diff -N net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc 6 Sep 2011 04:21:40 -0000
@@ -0,0 +1,11 @@
+--- src/utils/lib/CryptoPP.cc~
++++ src/utils/lib/CryptoPP.cc
+@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEucl
+ Element g[3]={b, a};
+ unsigned int i0=0, i1=1, i2=2;
+
+- while (!Equal(g[i1], this->Identity()))
++ while (!this->Equal(g[i1], this->Identity()))
+ {
+ g[i2] = Mod(g[i0], g[i1]);
+ unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
Index: net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
===================================================================
RCS file: net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
diff -N net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h 6 Sep 2011 04:42:35 -0000
@@ -0,0 +1,20 @@
+--- src/utils/lib/CryptoPP.h~
++++ src/utils/lib/CryptoPP.h
+@@ -2632,7 +2633,7 @@ public:
+
+ pointer allocate(size_type n, const void * = NULL)
+ {
+- CheckSize(n);
++ this->CheckSize(n);
+ if (n == 0)
+ return NULL;
+ return new T[n];
+@@ -5611,7 +5612,7 @@ template <class T, class B, class BASE>
+ {
+ this->ThrowIfInvalidTruncatedSize(size);
+
+- PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
++ this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
+ CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
+
+ this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86y5y28d45.fsf>