ports/56618: update of net/xmule
YazzY
yazzy at yazzy.org
Tue Sep 9 00:50:14 UTC 2003
>Number: 56618
>Category: ports
>Synopsis: update of net/xmule
>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: Mon Sep 08 17:50:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: YazzY
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
YazzY.org
>Environment:
System: FreeBSD lapdance 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 8 16:58:13 CEST 2003 root at lapdance:/usr/obj/usr/src/sys/LAPDANCE i386
>Description:
update of net/xmule to xmule-1.6.0_1. The old port is marked as FORBIDDEN.
>How-To-Repeat:
>Fix:
--- xmule.diff begins here ---
diff -ruN xmule.bak/Makefile xmule/Makefile
--- xmule.bak/Makefile Wed Aug 27 17:22:32 2003
+++ xmule/Makefile Tue Sep 9 02:43:22 2003
@@ -1,12 +1,11 @@
# New ports collection makefile for: xmule
-# Date created: Tue Mar 11 05:06:20 UTC 2003
-# Whom: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
-# $FreeBSD: ports/net/xmule/Makefile,v 1.14 2003/08/27 15:22:32 nectar Exp $
+# Date created: Tue Sep 09 02:35:31 CEST 2003
+# Whom: Marcin Jessa <yazzy at yazzy.org>
#
+# $FreeBSD:
PORTNAME= xmule
-PORTVERSION= 1.4.3
+PORTVERSION= 1.6.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,8 +14,8 @@
MAINTAINER= lioux at FreeBSD.org
COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
-FORBIDDEN= Multiple vulnerabilities, see \
- http://security.e-matters.de/advisories/022003.html
+#FORBIDDEN= Multiple vulnerabilities, see \
+# http://security.e-matters.de/advisories/022003.html
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
expat.4:${PORTSDIR}/textproc/expat2 \
diff -ruN xmule.bak/distinfo xmule/distinfo
--- xmule.bak/distinfo Thu Aug 21 13:19:17 2003
+++ xmule/distinfo Tue Sep 9 02:43:22 2003
@@ -1 +1 @@
-MD5 (xmule-1.4.3.tar.bz2) = 419b5a764f1d9fd676daa6819e1cf537
+MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144
diff -ruN xmule.bak/files/patch-Preferences.cpp xmule/files/patch-Preferences.cpp
--- xmule.bak/files/patch-Preferences.cpp Thu Jun 12 00:29:38 2003
+++ xmule/files/patch-Preferences.cpp Tue Sep 9 02:43:22 2003
@@ -1,7 +1,7 @@
---- src/Preferences.cpp.orig Mon May 26 12:08:45 2003
-+++ src/Preferences.cpp Mon May 26 12:10:14 2003
-@@ -65,7 +65,7 @@
- extern int sprintf(char *__restrict __s,__const char*__restrict __format,...) __attribute__ ((__format__ (__printf__, 2,3)));
+--- src/Preferences.cpp.orig Tue Sep 9 00:56:24 2003
++++ src/Preferences.cpp Tue Sep 9 00:56:21 2003
+@@ -60,7 +60,7 @@
+ #endif
#ifdef __FreeBSD__
-extern long long atoll(char *s);
diff -ruN xmule.bak/files/patch-configure xmule/files/patch-configure
--- xmule.bak/files/patch-configure Thu Jun 12 00:26:49 2003
+++ xmule/files/patch-configure Tue Sep 9 02:43:22 2003
@@ -1,29 +1,12 @@
---- configure.orig Mon May 26 22:56:09 2003
-+++ configure Tue May 27 17:55:59 2003
-@@ -1712,8 +1712,6 @@
-
- # Checks for programs.
- # hopefully this prevents -O2
--CXXFLAGS="-g -rdynamic"
--CFLAGS="-g -rdynamic"
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7149,7 +7147,7 @@
+--- configure.orig Tue Sep 9 00:47:46 2003
++++ configure Tue Sep 9 00:46:14 2003
+@@ -7540,7 +7540,8 @@
echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5
echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6
- if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
++#if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
+ if $WX_CONFIG_NAME --static --libs | grep -q 'glib-2' ; then
GTK_USEDVERSION=2
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-@@ -7161,7 +7159,7 @@
-
-
-
--if test x$GTK_USEDVERSION == x2 ; then
-+if test x$GTK_USEDVERSION = x2 ; then
- # Check whether --enable-gtktest or --disable-gtktest was given.
- if test "${enable_gtktest+set}" = set; then
- enableval="$enable_gtktest"
diff -ruN xmule.bak/files/patch-src::KnownFile.cpp xmule/files/patch-src::KnownFile.cpp
--- xmule.bak/files/patch-src::KnownFile.cpp Thu Jun 12 00:29:38 2003
+++ xmule/files/patch-src::KnownFile.cpp Thu Jan 1 01:00:00 1970
@@ -1,150 +0,0 @@
---- src/KnownFile.cpp.orig Wed Apr 30 14:30:10 2003
-+++ src/KnownFile.cpp Mon May 26 12:46:29 2003
-@@ -271,6 +271,73 @@
- return ferror(file);
- }
-
-+static void MD4Transform(uint32 Hash[4], uint32 x[16])
-+{
-+ uint32 a = Hash[0];
-+ uint32 b = Hash[1];
-+ uint32 c = Hash[2];
-+ uint32 d = Hash[3];
-+
-+ /* Round 1 */
-+ MD4_FF(a, b, c, d, x[ 0], S11); // 01
-+ MD4_FF(d, a, b, c, x[ 1], S12); // 02
-+ MD4_FF(c, d, a, b, x[ 2], S13); // 03
-+ MD4_FF(b, c, d, a, x[ 3], S14); // 04
-+ MD4_FF(a, b, c, d, x[ 4], S11); // 05
-+ MD4_FF(d, a, b, c, x[ 5], S12); // 06
-+ MD4_FF(c, d, a, b, x[ 6], S13); // 07
-+ MD4_FF(b, c, d, a, x[ 7], S14); // 08
-+ MD4_FF(a, b, c, d, x[ 8], S11); // 09
-+ MD4_FF(d, a, b, c, x[ 9], S12); // 10
-+ MD4_FF(c, d, a, b, x[10], S13); // 11
-+ MD4_FF(b, c, d, a, x[11], S14); // 12
-+ MD4_FF(a, b, c, d, x[12], S11); // 13
-+ MD4_FF(d, a, b, c, x[13], S12); // 14
-+ MD4_FF(c, d, a, b, x[14], S13); // 15
-+ MD4_FF(b, c, d, a, x[15], S14); // 16
-+
-+ /* Round 2 */
-+ MD4_GG(a, b, c, d, x[ 0], S21); // 17
-+ MD4_GG(d, a, b, c, x[ 4], S22); // 18
-+ MD4_GG(c, d, a, b, x[ 8], S23); // 19
-+ MD4_GG(b, c, d, a, x[12], S24); // 20
-+ MD4_GG(a, b, c, d, x[ 1], S21); // 21
-+ MD4_GG(d, a, b, c, x[ 5], S22); // 22
-+ MD4_GG(c, d, a, b, x[ 9], S23); // 23
-+ MD4_GG(b, c, d, a, x[13], S24); // 24
-+ MD4_GG(a, b, c, d, x[ 2], S21); // 25
-+ MD4_GG(d, a, b, c, x[ 6], S22); // 26
-+ MD4_GG(c, d, a, b, x[10], S23); // 27
-+ MD4_GG(b, c, d, a, x[14], S24); // 28
-+ MD4_GG(a, b, c, d, x[ 3], S21); // 29
-+ MD4_GG(d, a, b, c, x[ 7], S22); // 30
-+ MD4_GG(c, d, a, b, x[11], S23); // 31
-+ MD4_GG(b, c, d, a, x[15], S24); // 32
-+
-+ /* Round 3 */
-+ MD4_HH(a, b, c, d, x[ 0], S31); // 33
-+ MD4_HH(d, a, b, c, x[ 8], S32); // 34
-+ MD4_HH(c, d, a, b, x[ 4], S33); // 35
-+ MD4_HH(b, c, d, a, x[12], S34); // 36
-+ MD4_HH(a, b, c, d, x[ 2], S31); // 37
-+ MD4_HH(d, a, b, c, x[10], S32); // 38
-+ MD4_HH(c, d, a, b, x[ 6], S33); // 39
-+ MD4_HH(b, c, d, a, x[14], S34); // 40
-+ MD4_HH(a, b, c, d, x[ 1], S31); // 41
-+ MD4_HH(d, a, b, c, x[ 9], S32); // 42
-+ MD4_HH(c, d, a, b, x[ 5], S33); // 43
-+ MD4_HH(b, c, d, a, x[13], S34); // 44
-+ MD4_HH(a, b, c, d, x[ 3], S31); // 45
-+ MD4_HH(d, a, b, c, x[11], S32); // 46
-+ MD4_HH(c, d, a, b, x[ 7], S33); // 47
-+ MD4_HH(b, c, d, a, x[15], S34); // 48
-+
-+ Hash[0] += a;
-+ Hash[1] += b;
-+ Hash[2] += c;
-+ Hash[3] += d;
-+}
-+
- void CKnownFile::CreateHashFromInput(FILE* file,CFile* file2, int Length, uchar* Output, uchar* in_string) {
- // time critial
- bool PaddingStarted = false;
-@@ -342,73 +409,6 @@
- return m_iPartCount>0?m_iPartCount:(m_iPartCount=((m_nFileSize+(PARTSIZE-1))/PARTSIZE));
- }
- #endif
--
--static void MD4Transform(uint32 Hash[4], uint32 x[16])
--{
-- uint32 a = Hash[0];
-- uint32 b = Hash[1];
-- uint32 c = Hash[2];
-- uint32 d = Hash[3];
--
-- /* Round 1 */
-- MD4_FF(a, b, c, d, x[ 0], S11); // 01
-- MD4_FF(d, a, b, c, x[ 1], S12); // 02
-- MD4_FF(c, d, a, b, x[ 2], S13); // 03
-- MD4_FF(b, c, d, a, x[ 3], S14); // 04
-- MD4_FF(a, b, c, d, x[ 4], S11); // 05
-- MD4_FF(d, a, b, c, x[ 5], S12); // 06
-- MD4_FF(c, d, a, b, x[ 6], S13); // 07
-- MD4_FF(b, c, d, a, x[ 7], S14); // 08
-- MD4_FF(a, b, c, d, x[ 8], S11); // 09
-- MD4_FF(d, a, b, c, x[ 9], S12); // 10
-- MD4_FF(c, d, a, b, x[10], S13); // 11
-- MD4_FF(b, c, d, a, x[11], S14); // 12
-- MD4_FF(a, b, c, d, x[12], S11); // 13
-- MD4_FF(d, a, b, c, x[13], S12); // 14
-- MD4_FF(c, d, a, b, x[14], S13); // 15
-- MD4_FF(b, c, d, a, x[15], S14); // 16
--
-- /* Round 2 */
-- MD4_GG(a, b, c, d, x[ 0], S21); // 17
-- MD4_GG(d, a, b, c, x[ 4], S22); // 18
-- MD4_GG(c, d, a, b, x[ 8], S23); // 19
-- MD4_GG(b, c, d, a, x[12], S24); // 20
-- MD4_GG(a, b, c, d, x[ 1], S21); // 21
-- MD4_GG(d, a, b, c, x[ 5], S22); // 22
-- MD4_GG(c, d, a, b, x[ 9], S23); // 23
-- MD4_GG(b, c, d, a, x[13], S24); // 24
-- MD4_GG(a, b, c, d, x[ 2], S21); // 25
-- MD4_GG(d, a, b, c, x[ 6], S22); // 26
-- MD4_GG(c, d, a, b, x[10], S23); // 27
-- MD4_GG(b, c, d, a, x[14], S24); // 28
-- MD4_GG(a, b, c, d, x[ 3], S21); // 29
-- MD4_GG(d, a, b, c, x[ 7], S22); // 30
-- MD4_GG(c, d, a, b, x[11], S23); // 31
-- MD4_GG(b, c, d, a, x[15], S24); // 32
--
-- /* Round 3 */
-- MD4_HH(a, b, c, d, x[ 0], S31); // 33
-- MD4_HH(d, a, b, c, x[ 8], S32); // 34
-- MD4_HH(c, d, a, b, x[ 4], S33); // 35
-- MD4_HH(b, c, d, a, x[12], S34); // 36
-- MD4_HH(a, b, c, d, x[ 2], S31); // 37
-- MD4_HH(d, a, b, c, x[10], S32); // 38
-- MD4_HH(c, d, a, b, x[ 6], S33); // 39
-- MD4_HH(b, c, d, a, x[14], S34); // 40
-- MD4_HH(a, b, c, d, x[ 1], S31); // 41
-- MD4_HH(d, a, b, c, x[ 9], S32); // 42
-- MD4_HH(c, d, a, b, x[ 5], S33); // 43
-- MD4_HH(b, c, d, a, x[13], S34); // 44
-- MD4_HH(a, b, c, d, x[ 3], S31); // 45
-- MD4_HH(d, a, b, c, x[11], S32); // 46
-- MD4_HH(c, d, a, b, x[ 7], S33); // 47
-- MD4_HH(b, c, d, a, x[15], S34); // 48
--
-- Hash[0] += a;
-- Hash[1] += b;
-- Hash[2] += c;
-- Hash[3] += d;
--}
-
- // Adde by Tarod [Juanjo]
- void CAbstractFile::SetFileName(char* NewName)
diff -ruN xmule.bak/files/patch-src::KnownFile.h xmule/files/patch-src::KnownFile.h
--- xmule.bak/files/patch-src::KnownFile.h Thu Jun 12 00:29:38 2003
+++ xmule/files/patch-src::KnownFile.h Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
---- src/KnownFile.h.orig Tue May 20 21:16:04 2003
-+++ src/KnownFile.h Tue May 20 21:23:46 2003
-@@ -203,9 +203,6 @@
- (a) = MD4_ROTATE_LEFT((a), (s)); \
- }
-
--static void MD4Transform(uint32 Hash[4], uint32 x[16]);
--
--
- #if 0
- // old implementation
- class CFileStatistic{
diff -ruN xmule.bak/files/patch-src::xmule.cpp xmule/files/patch-src::xmule.cpp
--- xmule.bak/files/patch-src::xmule.cpp Thu Aug 21 13:19:17 2003
+++ xmule/files/patch-src::xmule.cpp Tue Sep 9 02:43:22 2003
@@ -1,20 +1,20 @@
---- src/xmule.cpp.orig Mon Aug 11 14:38:14 2003
-+++ src/xmule.cpp Mon Aug 11 14:38:27 2003
-@@ -763,7 +763,7 @@
+--- src/xmule.cpp.orig Tue Sep 9 00:15:19 2003
++++ src/xmule.cpp Tue Sep 9 00:16:06 2003
+@@ -797,7 +797,7 @@
+ delete[] emulesig_path;
delete[] xmulesig_path;
- }
-
+ } //End Added By Bouc7
-#if defined(__Linux__)
+#if 0
#include <execinfo.h>
#endif
-@@ -776,7 +776,7 @@
- theApp.clientudp->Destroy();
+@@ -810,7 +810,7 @@
+ theApp.clientudp->Destroy();
- // (stkn) create backtrace
+ // (stkn) create backtrace
-#if defined(__Linux__)
+#if 0
- void * bt_array[100]; // 100 should be enough ?!?
- char ** bt_strings;
- int num_entries;
+ void *bt_array[100]; // 100 should be enough ?!?
+ char **bt_strings;
+ int num_entries;
--- xmule.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list