pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/amule amule: updated to 2.3.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/be1c7ee94712
branches: trunk
changeset: 454031:be1c7ee94712
user: adam <adam%pkgsrc.org@localhost>
date: Sat Jun 05 13:05:56 2021 +0000
description:
amule: updated to 2.3.3
2.3.3 - The "delayed too many times, but still not too late" version
Yes, it's been delayed too many times, but finally it's out! With all the new features and bug fixes from the past four years! Let me highlight some for you:
CMake support. CMake provides us platform-independent configuration files and generates native makefiles and workspaces for the compiler of your choice. It's highly experimental in its current state,
but it aims to take the place of good old autoconf/automake one day.
Command completion with the TAB key in amulecmd.
Supports compilation with the latest C++ standard (C++17).
Scope graphs now (should) work on Mac.
Notification when a download completes.
diffstat:
net/amule/Makefile | 12 +-
net/amule/PLIST | 7 +-
net/amule/distinfo | 13 +-
net/amule/patches/patch-src_ClientCreditsList.cpp | 18 -
net/amule/patches/patch-src_UPnPBase.cpp | 339 ----------------------
net/amule/patches/patch-src_UPnPBase.h | 24 -
6 files changed, 16 insertions(+), 397 deletions(-)
diffs (truncated from 502 to 300 lines):
diff -r 49cc71d17c94 -r be1c7ee94712 net/amule/Makefile
--- a/net/amule/Makefile Sat Jun 05 12:55:42 2021 +0000
+++ b/net/amule/Makefile Sat Jun 05 13:05:56 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2021/05/24 19:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2021/06/05 13:05:56 adam Exp $
-DISTNAME= aMule-2.3.2
+DISTNAME= aMule-2.3.3
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX= .tar.bz2
@@ -18,10 +17,11 @@
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config perl:run
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-wx-config=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
+CONFIGURE_ARGS+= --with-wx-config=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
CONFIGURE_ARGS+= --with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp}
CONFIGURE_ARGS+= --with-language=all
CONFIGURE_ARGS+= --enable-xas
+TEST_TARGET= check
CXXFLAGS+= -Wno-undef
@@ -37,11 +37,9 @@
UNLIMIT_RESOURCES+= datasize
-TEST_TARGET= check
-
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/crypto++/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 49cc71d17c94 -r be1c7ee94712 net/amule/PLIST
--- a/net/amule/PLIST Sat Jun 05 12:55:42 2021 +0000
+++ b/net/amule/PLIST Sat Jun 05 13:05:56 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2020/11/19 20:01:40 nia Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/06/05 13:05:56 adam Exp $
${PLIST.alc}bin/alc
${PLIST.alcc}bin/alcc
${PLIST.amule}bin/amule
@@ -83,6 +83,7 @@
${PLIST.cmd}man/ro/man1/amulecmd.1
${PLIST.daemon}man/ro/man1/amuled.1
${PLIST.gui}man/ro/man1/amulegui.1
+${PLIST.web}man/ro/man1/amuleweb.1
${PLIST.cas}man/ro/man1/cas.1
${PLIST.ed2k}man/ro/man1/ed2k.1
${PLIST.wxcas}man/ro/man1/wxcas.1
@@ -93,6 +94,7 @@
${PLIST.cmd}man/ru/man1/amulecmd.1
${PLIST.daemon}man/ru/man1/amuled.1
${PLIST.gui}man/ru/man1/amulegui.1
+${PLIST.web}man/ru/man1/amuleweb.1
${PLIST.cas}man/ru/man1/cas.1
${PLIST.ed2k}man/ru/man1/ed2k.1
${PLIST.wxcas}man/ru/man1/wxcas.1
@@ -103,6 +105,7 @@
${PLIST.cmd}man/tr/man1/amulecmd.1
${PLIST.daemon}man/tr/man1/amuled.1
${PLIST.gui}man/tr/man1/amulegui.1
+${PLIST.web}man/tr/man1/amuleweb.1
${PLIST.cas}man/tr/man1/cas.1
${PLIST.ed2k}man/tr/man1/ed2k.1
${PLIST.wxcas}man/tr/man1/wxcas.1
@@ -113,6 +116,7 @@
${PLIST.cmd}man/zh_TW/man1/amulecmd.1
${PLIST.daemon}man/zh_TW/man1/amuled.1
${PLIST.gui}man/zh_TW/man1/amulegui.1
+${PLIST.web}man/zh_TW/man1/amuleweb.1
${PLIST.cas}man/zh_TW/man1/cas.1
${PLIST.ed2k}man/zh_TW/man1/ed2k.1
${PLIST.wxcas}man/zh_TW/man1/wxcas.1
@@ -120,6 +124,7 @@
${PLIST.skins}share/amule/skins/Mac_Gray.zip
${PLIST.skins}share/amule/skins/gnome.zip
${PLIST.skins}share/amule/skins/kde4.zip
+${PLIST.skins}share/amule/skins/papirus.zip
${PLIST.skins}share/amule/skins/priscilla.zip
${PLIST.skins}share/amule/skins/tango.zip
${PLIST.skins}share/amule/skins/xfce.zip
diff -r 49cc71d17c94 -r be1c7ee94712 net/amule/distinfo
--- a/net/amule/distinfo Sat Jun 05 12:55:42 2021 +0000
+++ b/net/amule/distinfo Sat Jun 05 13:05:56 2021 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.22 2020/11/19 20:01:40 nia Exp $
+$NetBSD: distinfo,v 1.23 2021/06/05 13:05:56 adam Exp $
-SHA1 (aMule-2.3.2.tar.bz2) = 65bb4197a5c2d9c95dc18bb458fa33d221035244
-RMD160 (aMule-2.3.2.tar.bz2) = 71ed96bff4e81bdd8fa97045f8589531609b1232
-SHA512 (aMule-2.3.2.tar.bz2) = 55567aa82c48c741bc9af92e9118a68a76b33b696639802f1bf627c02c1fa1f76af9e3b611bec443e68ff42eac3d508cb8522c97b83366c0a9258075f7a3fd31
-Size (aMule-2.3.2.tar.bz2) = 4950017 bytes
+SHA1 (aMule-2.3.3.tar.bz2) = 1c88e238b2ce3f3e1516c7a6cb94c611aa187dce
+RMD160 (aMule-2.3.3.tar.bz2) = a66491555184bee73a7cdebe11d22cb62fff1706
+SHA512 (aMule-2.3.3.tar.bz2) = eb42646dc835fb49f81def5c3ecceca2adceacb6dc9e4a7fec08e9ab8d7bd20d2fa623a33b476a984c7a809e624f61cad3b9b40f68a3363dd936be25cda72211
+Size (aMule-2.3.3.tar.bz2) = 4606514 bytes
SHA1 (patch-aa) = af77036649caac372890c45840d24a404ab1a7d6
-SHA1 (patch-src_ClientCreditsList.cpp) = 03bf1956dd848fcc117d5043703840a51880ee9d
SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5
-SHA1 (patch-src_UPnPBase.cpp) = 6f8baa3af408632fcc0f0ff7d8e6f33a2d7ddb3d
-SHA1 (patch-src_UPnPBase.h) = 554eaa417df23918985b9a0fd16d5f77844f145a
diff -r 49cc71d17c94 -r be1c7ee94712 net/amule/patches/patch-src_ClientCreditsList.cpp
--- a/net/amule/patches/patch-src_ClientCreditsList.cpp Sat Jun 05 12:55:42 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_ClientCreditsList.cpp,v 1.1 2020/11/19 20:01:41 nia Exp $
-
-From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001
-From: Tommy Jerry Mairo <tommy.mairo%gmail.com@localhost>
-Date: Wed, 21 Mar 2018 19:56:28 +0100
-Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0
-
---- src/ClientCreditsList.cpp.orig 2016-09-16 07:55:06.000000000 +0000
-+++ src/ClientCreditsList.cpp
-@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypti
- // calculate and store public key
- CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
- CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
-- pubkey.DEREncode(asink);
-+ pubkey.GetMaterial().Save(asink);
- m_nMyPublicKeyLen = asink.TotalPutLength();
- asink.MessageEnd();
- } catch (const CryptoPP::Exception& e) {
diff -r 49cc71d17c94 -r be1c7ee94712 net/amule/patches/patch-src_UPnPBase.cpp
--- a/net/amule/patches/patch-src_UPnPBase.cpp Sat Jun 05 12:55:42 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
-$NetBSD: patch-src_UPnPBase.cpp,v 1.1 2020/11/19 20:01:41 nia Exp $
-
-Fix build with upnp 1.8.x.
-
-From FreeBSD Ports.
-
---- src/UPnPBase.cpp.orig 2016-09-16 07:55:07.000000000 +0000
-+++ src/UPnPBase.cpp
-@@ -823,14 +823,18 @@ m_WanService(NULL)
- s_CtrlPoint = this;
- // Null string at first
- std::ostringstream msg;
--
-+
-+ // Declare those here to avoid
-+ // "jump to label ‘error’ [-fpermissive] crosses initialization
-+ // of ‘char* ipAddress’"
-+ unsigned short port;
-+ char *ipAddress;
-+
- // Start UPnP
- int ret;
-- char *ipAddress = NULL;
-- unsigned short port = 0;
-- ret = UpnpInit(ipAddress, udpPort);
-+ ret = UpnpInit2(0, udpPort);
- if (ret != UPNP_E_SUCCESS) {
-- msg << "error(UpnpInit): Error code ";
-+ msg << "error(UpnpInit2): Error code ";
- goto error;
- }
- port = UpnpGetServerPort();
-@@ -1127,7 +1131,11 @@ bool CUPnPControlPoint::PrivateDeletePor
-
-
- // This function is static
-+#if UPNP_VERSION >= 10800
-+int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, void * /*Cookie*/)
-+#else
- int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
-+#endif
- {
- std::ostringstream msg;
- std::ostringstream msg2;
-@@ -1149,24 +1157,47 @@ int CUPnPControlPoint::Callback(Upnp_Eve
- msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
- // UPnP Discovery
- upnpDiscovery:
-+#if UPNP_VERSION >= 10800
-+ UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
-+#else
- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
-+#endif
- IXML_Document *doc = NULL;
-+#if UPNP_VERSION >= 10800
-+ int errCode = UpnpDiscovery_get_ErrCode(d_event);
-+ if (errCode != UPNP_E_SUCCESS) {
-+ msg << UpnpGetErrorMessage(errCode) << ".";
-+#else
- int ret;
- if (d_event->ErrCode != UPNP_E_SUCCESS) {
- msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
-+#endif
- AddDebugLogLineC(logUPnP, msg);
- }
- // Get the XML tree device description in doc
-+#if UPNP_VERSION >= 10800
-+ const char *location = UpnpDiscovery_get_Location_cstr(d_event);
-+ int ret = UpnpDownloadXmlDoc(location, &doc);
-+#else
- ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
-+#endif
- if (ret != UPNP_E_SUCCESS) {
- msg << "Error retrieving device description from " <<
-+#if UPNP_VERSION >= 10800
-+ location << ": " <<
-+#else
- d_event->Location << ": " <<
-+#endif
- UpnpGetErrorMessage(ret) <<
- "(" << ret << ").";
- AddDebugLogLineC(logUPnP, msg);
- } else {
- msg2 << "Retrieving device description from " <<
-+#if UPNP_VERSION >= 10800
-+ location << ".";
-+#else
- d_event->Location << ".";
-+#endif
- AddDebugLogLineN(logUPnP, msg2);
- }
- if (doc) {
-@@ -1194,8 +1225,14 @@ upnpDiscovery:
- AddDebugLogLineC(logUPnP, msg);
- }
- // Add the root device to our list
-+#if UPNP_VERSION >= 10800
-+ int expires = UpnpDiscovery_get_Expires(d_event);
-+ upnpCP->AddRootDevice(rootDevice, urlBase,
-+ location, expires);
-+#else
- upnpCP->AddRootDevice(rootDevice, urlBase,
- d_event->Location, d_event->Expires);
-+#endif
- }
- // Free the XML doc tree
- IXML::Document::Free(doc);
-@@ -1216,28 +1253,60 @@ upnpDiscovery:
- case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
- //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
- // UPnP Device Removed
-+#if UPNP_VERSION >= 10800
-+ UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
-+ int errCode = UpnpDiscovery_get_ErrCode(dab_event);
-+ if (errCode != UPNP_E_SUCCESS) {
-+#else
- struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
- if (dab_event->ErrCode != UPNP_E_SUCCESS) {
-+#endif
- msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
-+#if UPNP_VERSION >= 10800
-+ UpnpGetErrorMessage(errCode) <<
-+#else
- UpnpGetErrorMessage(dab_event->ErrCode) <<
-+#endif
- ".";
- AddDebugLogLineC(logUPnP, msg);
- }
-+#if UPNP_VERSION >= 10800
-+ std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
-+#else
- std::string devType = dab_event->DeviceType;
-+#endif
- // Check for an InternetGatewayDevice and removes it from the list
- std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
- if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
-+#if UPNP_VERSION >= 10800
-+ const char *deviceID =
-+ UpnpDiscovery_get_DeviceID_cstr(dab_event);
-+ upnpCP->RemoveRootDevice(deviceID);
-+#else
- upnpCP->RemoveRootDevice(dab_event->DeviceId);
-+#endif
- }
- break;
- }
- case UPNP_EVENT_RECEIVED: {
- //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
- // Event reveived
-+#if UPNP_VERSION >= 10800
-+ UpnpEvent *e_event = (UpnpEvent *)Event;
-+ int eventKey = UpnpEvent_get_EventKey(e_event);
-+ IXML_Document *changedVariables =
-+ UpnpEvent_get_ChangedVariables(e_event);
-+ const std::string sid = UpnpEvent_get_SID_cstr(e_event);
-+#else
- struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
- const std::string Sid = e_event->Sid;
-+#endif
- // Parses the event
-+#if UPNP_VERSION >= 10800
-+ upnpCP->OnEventReceived(sid, eventKey, changedVariables);
-+#else
- upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
-+#endif
Home |
Main Index |
Thread Index |
Old Index