@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Sun Sep 22 17:53:50 UTC 2019 - olaf@aepfle.de

+

+- Update to version 2.3.2.20190827.2a1b09233

+

+-------------------------------------------------------------------

 Fri Aug  2 07:39:08 UTC 2019 - Dave Plater <davejplater@gmail.com>

 - Enabled wxWidgets >= 3.0.

​

@@ -15,16 +15,13 @@

 Name:           aMule

-Version:        2.3.2.20181119.20afd75fa

+Version:        2.3.2.20190827.2a1b09233

 Release:        0

 Summary:        Another eMule file-sharing program

 License:        GPL-2.0+

 Group:          Productivity/Networking/Other

 Url:            http://www.amule.org

 Source:         %{name}-%{version}.tar.xz

-Patch0:         0001-Fix-desktop-files.patch

-# PATCH-FIX-UPSTREAM GH #135

-Patch1:        fix-build-libupnp18.patch

 BuildRequires:  autoconf

 BuildRequires:  automake >= 1.9

 BuildRequires:  binutils-devel

@@ -82,12 +79,7 @@

 This package contains the plasma widget for aMule.

 %prep

-%setup -q

-%patch0 -p1

-#TW has libupnp >= 1.8.0

-%if 0%{?suse_version} > 1500

-%patch1 -p1

-%endif

+%autosetup -p1

 %build

 ./autogen.sh

​

@@ -1,92 +0,0 @@

-diff --git a/amule.desktop b/amule.desktop

-index 2928ea5d8..91aca7ac1 100644

---- a/amule.desktop

-+++ b/amule.desktop

-@@ -5,9 +5,9 @@ Icon=amule

- Terminal=false

- Type=Application

- Categories=Network;P2P;

--Comment=A client for the eD2k network

--Comment[fr]=Un client pour le réseau eD2k

--Comment[tr]=eD2k ağı için istemci

--Comment[zh_CN]=eD2k网络客户端

--Comment[it]=Un client per la rete eD2k

--Comment[it_CH]=Un client per la rete eD2k

-+GenericName=A client for the eD2k network

-+GenericName[fr]=Un client pour le réseau eD2k

-+GenericName[tr]=eD2k ağı için istemci

-+GenericName[zh_CN]=eD2k网络客户端

-+GenericName[it]=Un client per la rete eD2k

-+GenericName[it_CH]=Un client per la rete eD2k

-diff --git a/amulegui.desktop b/amulegui.desktop

-index 14c5035a5..4248f361c 100644

---- a/amulegui.desktop

-+++ b/amulegui.desktop

-@@ -5,11 +5,11 @@ Icon=amulegui

- Terminal=false

- Type=Application

- Categories=Network;P2P;

--Comment=aMule remote control

--Comment[de]=aMule-Fernsteuerung

--Comment[fr]=Contrôle à distance d'aMule

--Comment[hu]=aMule távoli vezérlő

--Comment[tr]=aMule uzaktan kumandası

--Comment[zh_CN]=aMule远程协议

--Comment[it]=Terminale remoto per aMule

--Comment[it_CH]=Terminale remoto per aMule

-+GenericName=aMule remote control

-+GenericName[de]=aMule-Fernsteuerung

-+GenericName[fr]=Contrôle à distance d'aMule

-+GenericName[hu]=aMule távoli vezérlő

-+GenericName[tr]=aMule uzaktan kumandası

-+GenericName[zh_CN]=aMule远程协议

-+GenericName[it]=Terminale remoto per aMule

-+GenericName[it_CH]=Terminale remoto per aMule

-diff --git a/src/utils/aLinkCreator/alc.desktop b/src/utils/aLinkCreator/alc.desktop

-index 0f13ff882..76c73f36c 100644

---- a/src/utils/aLinkCreator/alc.desktop

-+++ b/src/utils/aLinkCreator/alc.desktop

-@@ -5,11 +5,11 @@ Icon=alc

- Terminal=false

- Type=Application

- Categories=Network;P2P;

--Comment=aMule ed2k link creator

--Comment[de]=ed2k-Linkersteller

--Comment[fr]=Créateur de liens ed2k d'aMule

--Comment[hu]=ed2k hivatkozás készítő

--Comment[tr]=aMule için ed2k bağlantı yaratıcısı

--Comment[zh_CN]=aMule ed2k链接创建工具

--Comment[it]=Creatore di link eD2k

--Comment[it_CH]=Creatore di link eD2k

-+GenericName=aMule ed2k link creator

-+GenericName[de]=ed2k-Linkersteller

-+GenericName[fr]=Créateur de liens ed2k d'aMule

-+GenericName[hu]=ed2k hivatkozás készítő

-+GenericName[tr]=aMule için ed2k bağlantı yaratıcısı

-+GenericName[zh_CN]=aMule ed2k链接创建工具

-+GenericName[it]=Creatore di link eD2k

-+GenericName[it_CH]=Creatore di link eD2k

-diff --git a/src/utils/wxCas/wxcas.desktop b/src/utils/wxCas/wxcas.desktop

-index 9d83dfec7..e866c1742 100644

---- a/src/utils/wxCas/wxcas.desktop

-+++ b/src/utils/wxCas/wxcas.desktop

-@@ -5,11 +5,11 @@ Icon=wxcas

- Terminal=false

- Type=Application

- Categories=Network;P2P;

--Comment=aMule online statistics

--Comment[de]=aMule-Onlinestatistik

--Comment[fr]=Statistiques d'aMule en ligne

--Comment[hu]=aMule online statisztikák

--Comment[tr]=Çevrim içi aMule istatistikleri

--Comment[zh_CN]=aMule在线统计

--Comment[it]=Statistiche online di aMule

--Comment[it_CH]=Statistiche online di aMule

-+GenericName=aMule online statistics

-+GenericName[de]=aMule-Onlinestatistik

-+GenericName[fr]=Statistiques d'aMule en ligne

-+GenericName[hu]=aMule online statisztikák

-+GenericName[tr]=Çevrim içi aMule istatistikleri

-+GenericName[zh_CN]=aMule在线统计

-+GenericName[it]=Statistiche online di aMule

-+GenericName[it_CH]=Statistiche online di aMule

​

@@ -1,363 +0,0 @@

-From 78367d7a0fb12e6907cfce46a35c86fc7d65e733 Mon Sep 17 00:00:00 2001

-From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>

-Date: Tue, 2 Oct 2018 18:15:19 -0300

-Subject: [PATCH 1/3] Add a .gitignore to the project

-

----

- .gitignore | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++

- 1 file changed, 51 insertions(+)

- create mode 100644 .gitignore

-

-diff --git a/.gitignore b/.gitignore

-new file mode 100644

-index 000000000..80a596b72

---- /dev/null

-+++ b/.gitignore

-@@ -0,0 +1,51 @@

-+*.a

-+*.o

-+*.gmo

-+*.swp

-+*~

-+.*~

-+Makefile

-+Makefile.in

-+Makefile.in.in

-+Makefile.user

-+.deps

-+POTFILES

-+

-+

-+ABOUT-NLS

-+aclocal.m4

-+autom4te.cache/

-+compile

-+config.guess

-+config.h

-+config.h.in

-+config.log

-+config.rpath

-+config.status

-+config.sub

-+configure

-+depcomp

-+install-sh

-+intl/

-+missing

-+mkinstalldirs

-+

-+src/amule

-+src/amulecmd

-+src/amuled

-+src/amulegui

-+src/ed2k

-+src/libs/ec/ECGeneratedFiles

-+src/libs/ec/cpp/EC-timestamp

-+src/libs/ec/cpp/ECVersion.h

-+src/libs/ec/cpp/mkFileSum

-+src/pixmaps/flags_xpm/CountryFlags.h

-+src/pixmaps/flags_xpm/Makefile.am

-+src/utils/cas/cas

-+src/utils/scripts/denoiser.sed

-+src/utils/wxCas/src/wxcas

-+src/utils/xas/autostart-xas

-+src/webserver/src/amuleweb

-+stamp-h1

-+test-driver

-+

-

-From f6dccde218fed8dabd3c61efce02d29b320858fe Mon Sep 17 00:00:00 2001

-From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>

-Date: Tue, 2 Oct 2018 18:17:43 -0300

-Subject: [PATCH 2/3] Make aMule compatible with libupnp 1.8

-

----

- src/UPnPBase.cpp | 110 +++++++++++++++++++++++++++--------------------

- src/UPnPBase.h   |   6 +--

- 2 files changed, 66 insertions(+), 50 deletions(-)

-

-diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp

-index 01a7c3a05..d4063a136 100644

---- a/src/UPnPBase.cpp

-+++ b/src/UPnPBase.cpp

-@@ -1127,7 +1127,7 @@ bool CUPnPControlPoint::PrivateDeletePortMapping(

- 

- 

- // This function is static

--int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)

-+int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, void * /*Cookie*/)

- {

-   std::ostringstream msg;

-   std::ostringstream msg2;

-@@ -1149,24 +1149,25 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

-       msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";

-       // UPnP Discovery

- upnpDiscovery:

--      struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;

-+      UpnpDiscovery *d_event = (UpnpDiscovery *)Event;

-       IXML_Document *doc = NULL;

--      int ret;

--      if (d_event->ErrCode != UPNP_E_SUCCESS) {

--          msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";

-+      int errCode = UpnpDiscovery_get_ErrCode(d_event);

-+      if (errCode != UPNP_E_SUCCESS) {

-+          msg << UpnpGetErrorMessage(errCode) << ".";

-           AddDebugLogLineC(logUPnP, msg);

-       }

-       // Get the XML tree device description in doc

--      ret = UpnpDownloadXmlDoc(d_event->Location, &doc);

-+      const char *location = UpnpDiscovery_get_Location_cstr(d_event);

-+      int ret = UpnpDownloadXmlDoc(location, &doc);

-       if (ret != UPNP_E_SUCCESS) {

-           msg << "Error retrieving device description from " <<

--              d_event->Location << ": " <<

-+              location << ": " <<

-               UpnpGetErrorMessage(ret) <<

-               "(" << ret << ").";

-           AddDebugLogLineC(logUPnP, msg);

-       } else {

-           msg2 << "Retrieving device description from " <<

--              d_event->Location << ".";

-+              location << ".";

-           AddDebugLogLineN(logUPnP, msg2);

-       }

-       if (doc) {

-@@ -1194,8 +1195,9 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

-                   AddDebugLogLineC(logUPnP, msg);

-               }

-               // Add the root device to our list

-+              int expires = UpnpDiscovery_get_Expires(d_event);

-               upnpCP->AddRootDevice(rootDevice, urlBase,

--                  d_event->Location, d_event->Expires);

-+                  location, expires);

-           }

-           // Free the XML doc tree

-           IXML::Document::Free(doc);

-@@ -1216,28 +1218,35 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

-   case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {

-       //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");

-       // UPnP Device Removed

--      struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;

--      if (dab_event->ErrCode != UPNP_E_SUCCESS) {

-+      UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;

-+      int errCode = UpnpDiscovery_get_ErrCode(dab_event);

-+      if (errCode != UPNP_E_SUCCESS) {

-           msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<

--              UpnpGetErrorMessage(dab_event->ErrCode) <<

-+              UpnpGetErrorMessage(errCode) <<

-               ".";

-           AddDebugLogLineC(logUPnP, msg);

-       }

--      std::string devType = dab_event->DeviceType;

-+      std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);

-       // Check for an InternetGatewayDevice and removes it from the list

--      std::transform(devType.begin(), devType.end(), devType.begin(), tolower);

-+      std::transform(devType.begin(), devType.end(),

-+          devType.begin(), tolower);

-       if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {

--          upnpCP->RemoveRootDevice(dab_event->DeviceId);

-+          const char *deviceID =

-+              UpnpDiscovery_get_DeviceID_cstr(dab_event);

-+          upnpCP->RemoveRootDevice(deviceID);

-       }

-       break;

-   }

-   case UPNP_EVENT_RECEIVED: {

-       //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");

-       // Event reveived

--      struct Upnp_Event *e_event = (struct Upnp_Event *)Event;

--      const std::string Sid = e_event->Sid;

-+      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);

-       // Parses the event

--      upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);

-+      upnpCP->OnEventReceived(sid, eventKey, changedVariables);

-       break;

-   }

-   case UPNP_EVENT_SUBSCRIBE_COMPLETE:

-@@ -1252,24 +1261,23 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

-       //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");

-       msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";

- upnpEventRenewalComplete:

--      struct Upnp_Event_Subscribe *es_event =

--          (struct Upnp_Event_Subscribe *)Event;

--      if (es_event->ErrCode != UPNP_E_SUCCESS) {

-+      UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;

-+      int errCode = UpnpEventSubscribe_get_ErrCode(es_event);

-+      if (errCode != UPNP_E_SUCCESS) {

-           msg << "Error in Event Subscribe Callback";

--          UPnP::ProcessErrorMessage(

--              msg.str(), es_event->ErrCode, NULL, NULL);

-+          UPnP::ProcessErrorMessage(msg.str(), errCode, NULL, NULL);

-       } else {

- #if 0

-+          const UpnpString *publisherUrl =

-+              UpnpEventSubscribe_get_PublisherUrl(es_event);

-+          const char *sid = UpnpEvent_get_SID_cstr(es_event);

​