From owner-svn-ports-all@freebsd.org Wed May 15 04:12:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92E5915A7D66; Wed, 15 May 2019 04:12:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38F4D710D4; Wed, 15 May 2019 04:12:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13DB34698; Wed, 15 May 2019 04:12:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4F4CId8019546; Wed, 15 May 2019 04:12:18 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4F4CIVG019545; Wed, 15 May 2019 04:12:18 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201905150412.x4F4CIVG019545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 15 May 2019 04:12:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501682 - in head/net-p2p: amule-devel/files amule/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net-p2p: amule-devel/files amule/files X-SVN-Commit-Revision: 501682 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 38F4D710D4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2019 04:12:19 -0000 Author: tobik Date: Wed May 15 04:12:18 2019 New Revision: 501682 URL: https://svnweb.freebsd.org/changeset/ports/501682 Log: net-p2p/amule*: Fix badly rebased patches from r499598 PR: 237407 Modified: head/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp head/net-p2p/amule/files/patch-src_UPnPBase.cpp Modified: head/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp ============================================================================== --- head/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp Wed May 15 03:13:13 2019 (r501681) +++ head/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp Wed May 15 04:12:18 2019 (r501682) @@ -1,6 +1,6 @@ --- src/UPnPBase.cpp.orig 2018-11-19 11:11:51 UTC +++ src/UPnPBase.cpp -@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePor +@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping( // This function is static @@ -12,7 +12,7 @@ { std::ostringstream msg; std::ostringstream msg2; -@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_Eve +@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventTy msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: "; // UPnP Discovery upnpDiscovery: @@ -66,16 +66,16 @@ // Add the root device to our list +#if UPNP_VERSION >= 10800 + int expires = UpnpDiscovery_get_Expires(d_event); -+ upnpCP->AddRootDevice(rootDevice, urlBase, + upnpCP->AddRootDevice(rootDevice, urlBase, + location, expires); +#else - upnpCP->AddRootDevice(rootDevice, urlBase, ++ upnpCP->AddRootDevice(rootDevice, urlBase, d_event->Location, d_event->Expires); +#endif } // Free the XML doc tree IXML::Document::Free(doc); -@@ -1216,28 +1249,58 @@ upnpDiscovery: +@@ -1216,28 +1249,60 @@ upnpDiscovery: case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: { //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n"); // UPnP Device Removed @@ -105,6 +105,8 @@ 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); @@ -120,7 +122,7 @@ + int eventKey = UpnpEvent_get_EventKey(e_event); + IXML_Document *changedVariables = + UpnpEvent_get_ChangedVariables(e_event); -+ onst std::string sid = UpnpEvent_get_SID_cstr(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; @@ -134,7 +136,7 @@ break; } case UPNP_EVENT_SUBSCRIBE_COMPLETE: -@@ -1252,19 +1315,39 @@ upnpDiscovery: +@@ -1252,19 +1317,39 @@ upnpDiscovery: //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n"); msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): "; upnpEventRenewalComplete: @@ -162,10 +164,10 @@ + UpnpEventSubscribe_get_PublisherUrl(es_event); + const char *sid = UpnpEvent_get_SID_cstr(es_event); + int timeOut = UpnpEvent_get_TimeOut(es_event); -+ TvCtrlPointHandleSubscribeUpdate( + TvCtrlPointHandleSubscribeUpdate( + publisherUrl, sid, timeOut); +#else - TvCtrlPointHandleSubscribeUpdate( ++ TvCtrlPointHandleSubscribeUpdate( GET_UPNP_STRING(es_event->PublisherUrl), es_event->Sid, es_event->TimeOut ); @@ -174,7 +176,7 @@ } break; -@@ -1280,29 +1363,56 @@ upnpEventRenewalComplete: +@@ -1280,29 +1365,56 @@ upnpEventRenewalComplete: msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): "; msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: "; upnpEventSubscriptionExpired: @@ -231,7 +233,7 @@ "' with SID == '" << newSID << "'."; AddDebugLogLineC(logUPnP, msg2); -@@ -1321,17 +1431,34 @@ upnpEventSubscriptionExpired: +@@ -1321,17 +1433,34 @@ upnpEventSubscriptionExpired: case UPNP_CONTROL_ACTION_COMPLETE: { //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n"); // This is here if we choose to do this asynchronously @@ -266,7 +268,7 @@ ""); } /* No need for any processing here, just print out results. -@@ -1342,22 +1469,38 @@ upnpEventSubscriptionExpired: +@@ -1342,21 +1471,37 @@ upnpEventSubscriptionExpired: case UPNP_CONTROL_GET_VAR_COMPLETE: { //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n"); msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): "; @@ -300,8 +302,7 @@ sv_event->CtrlUrl, sv_event->StateVarName, sv_event->CurrentVal ); - #endif +#endif + #endif } break; - } Modified: head/net-p2p/amule/files/patch-src_UPnPBase.cpp ============================================================================== --- head/net-p2p/amule/files/patch-src_UPnPBase.cpp Wed May 15 03:13:13 2019 (r501681) +++ head/net-p2p/amule/files/patch-src_UPnPBase.cpp Wed May 15 04:12:18 2019 (r501682) @@ -1,6 +1,6 @@ --- src/UPnPBase.cpp.orig 2016-09-16 07:55:07 UTC +++ src/UPnPBase.cpp -@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePor +@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping( // This function is static @@ -12,7 +12,7 @@ { std::ostringstream msg; std::ostringstream msg2; -@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_Eve +@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventTy msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: "; // UPnP Discovery upnpDiscovery: @@ -66,16 +66,16 @@ // Add the root device to our list +#if UPNP_VERSION >= 10800 + int expires = UpnpDiscovery_get_Expires(d_event); -+ upnpCP->AddRootDevice(rootDevice, urlBase, + upnpCP->AddRootDevice(rootDevice, urlBase, + location, expires); +#else - upnpCP->AddRootDevice(rootDevice, urlBase, ++ upnpCP->AddRootDevice(rootDevice, urlBase, d_event->Location, d_event->Expires); +#endif } // Free the XML doc tree IXML::Document::Free(doc); -@@ -1216,28 +1249,58 @@ upnpDiscovery: +@@ -1216,28 +1249,60 @@ upnpDiscovery: case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: { //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n"); // UPnP Device Removed @@ -105,6 +105,8 @@ 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); @@ -120,7 +122,7 @@ + int eventKey = UpnpEvent_get_EventKey(e_event); + IXML_Document *changedVariables = + UpnpEvent_get_ChangedVariables(e_event); -+ onst std::string sid = UpnpEvent_get_SID_cstr(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; @@ -134,7 +136,7 @@ break; } case UPNP_EVENT_SUBSCRIBE_COMPLETE: -@@ -1252,19 +1315,39 @@ upnpDiscovery: +@@ -1252,19 +1317,39 @@ upnpDiscovery: //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n"); msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): "; upnpEventRenewalComplete: @@ -162,10 +164,10 @@ + UpnpEventSubscribe_get_PublisherUrl(es_event); + const char *sid = UpnpEvent_get_SID_cstr(es_event); + int timeOut = UpnpEvent_get_TimeOut(es_event); -+ TvCtrlPointHandleSubscribeUpdate( + TvCtrlPointHandleSubscribeUpdate( + publisherUrl, sid, timeOut); +#else - TvCtrlPointHandleSubscribeUpdate( ++ TvCtrlPointHandleSubscribeUpdate( GET_UPNP_STRING(es_event->PublisherUrl), es_event->Sid, es_event->TimeOut ); @@ -174,7 +176,7 @@ } break; -@@ -1280,29 +1363,56 @@ upnpEventRenewalComplete: +@@ -1280,29 +1365,56 @@ upnpEventRenewalComplete: msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): "; msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: "; upnpEventSubscriptionExpired: @@ -231,7 +233,7 @@ "' with SID == '" << newSID << "'."; AddDebugLogLineC(logUPnP, msg2); -@@ -1321,17 +1431,34 @@ upnpEventSubscriptionExpired: +@@ -1321,17 +1433,34 @@ upnpEventSubscriptionExpired: case UPNP_CONTROL_ACTION_COMPLETE: { //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n"); // This is here if we choose to do this asynchronously @@ -266,7 +268,7 @@ ""); } /* No need for any processing here, just print out results. -@@ -1342,22 +1469,38 @@ upnpEventSubscriptionExpired: +@@ -1342,21 +1471,37 @@ upnpEventSubscriptionExpired: case UPNP_CONTROL_GET_VAR_COMPLETE: { //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n"); msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): "; @@ -300,8 +302,7 @@ sv_event->CtrlUrl, sv_event->StateVarName, sv_event->CurrentVal ); - #endif +#endif + #endif } break; - }