@@ -1,4 +1,12 @@

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

+Mon Dec 10 13:16:57 UTC 2018 - Javier Llorente <javier@opensuse.org>

+

+- Update to version 2.3.2.20181119.20afd75fa

+  * Bugfix: API mismatch with crypto++ 6.0.0; GH #120

+- Add patch to fix build: Update to libupnp 1.8; GH #135

+- Redo 0001-Fix-desktop-files.patch

+

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

 Sun Feb 26 09:23:20 UTC 2017 - martin@pluskal.org

 - Update to version 2.3.2.20161207.047a55c93

​

@@ -15,7 +15,7 @@

 Name:           aMule

-Version:        2.3.2.20161207.047a55c93

+Version:        2.3.2.20181119.20afd75fa

 Release:        0

 Summary:        Another eMule file-sharing program

 License:        GPL-2.0+

@@ -23,6 +23,8 @@

 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,6 +84,10 @@

 %prep

 %setup -q

 %patch0 -p1

+#TW has libupnp >= 1.8.0

+%if 0%{?suse_version} > 1500

+%patch1 -p1

+%endif

 %build

 ./autogen.sh

​

@@ -1,34 +1,28 @@

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

-From: Johannes Obermayr <johannesobermayr@gmx.de>

-Date: Sun, 14 Sep 2014 03:25:32 +0200

-Subject: [PATCH 1/2] Fix desktop files.

-

----

- amule.desktop                      |  6 +++---

- amulegui.desktop                   | 10 +++++-----

- src/utils/aLinkCreator/alc.desktop | 10 +++++-----

- src/utils/wxCas/wxcas.desktop      | 10 +++++-----

- 4 files changed, 18 insertions(+), 18 deletions(-)

-

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

-index 70be367..e15de2d 100644

+index 2928ea5d8..91aca7ac1 100644

 --- a/amule.desktop

 +++ b/amule.desktop

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

+@@ -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 8a446fd..be900f6 100644

+index 14c5035a5..4248f361c 100644

 --- a/amulegui.desktop

 +++ b/amulegui.desktop

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

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

  Terminal=false

  Type=Application

  Categories=Network;P2P;

@@ -37,16 +31,22 @@

 -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 50bf610..0f6a839 100644

+index 0f13ff882..76c73f36c 100644

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

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

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

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

  Terminal=false

  Type=Application

  Categories=Network;P2P;

@@ -55,16 +55,22 @@

 -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 b943ee8..0e64b76 100644

+index 9d83dfec7..e866c1742 100644

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

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

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

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

  Terminal=false

  Type=Application

  Categories=Network;P2P;

@@ -73,11 +79,14 @@

 -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

--- 

-2.1.0

-

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

++GenericName[it]=Statistiche online di aMule

++GenericName[it_CH]=Statistiche online di aMule

​

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

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

++          int timeOut = UpnpEvent_get_TimeOut(es_event);

+           TvCtrlPointHandleSubscribeUpdate(

+-              GET_UPNP_STRING(es_event->PublisherUrl),

+-              es_event->Sid,

+-              es_event->TimeOut );

++              publisherUrl, sid, timeOut);

+ #endif

+       }

+-

+       break;

+   }

+-

+   case UPNP_EVENT_AUTORENEWAL_FAILED:

+       //fprintf(stderr, "Callback: UPNP_EVENT_AUTORENEWAL_FAILED\n");

+       msg << "error(UPNP_EVENT_AUTORENEWAL_FAILED): ";

+@@ -1280,29 +1288,31 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

+       msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";

+       msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";

+ upnpEventSubscriptionExpired:

+-      struct Upnp_Event_Subscribe *es_event =

+-          (struct Upnp_Event_Subscribe *)Event;

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

+       Upnp_SID newSID;

+       memset(newSID, 0, sizeof(Upnp_SID));

+       int TimeOut = 1801;

++      const char *publisherUrl =

++          UpnpEventSubscribe_get_PublisherUrl_cstr(es_event);

+       int ret = UpnpSubscribe(

+           upnpCP->m_UPnPClientHandle,

+-          GET_UPNP_STRING(es_event->PublisherUrl),

++          publisherUrl,

+           &TimeOut,

+           newSID);

+       if (ret != UPNP_E_SUCCESS) {

+           msg << "Error Subscribing to EventURL";

++          int errCode = UpnpEventSubscribe_get_ErrCode(es_event);

+           UPnP::ProcessErrorMessage(

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

++              msg.str(), errCode, NULL, NULL);

+       } else {

+           ServiceMap::iterator it =

+-              upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));

++              upnpCP->m_ServiceMap.find(publisherUrl);

+           if (it != upnpCP->m_ServiceMap.end()) {

+               CUPnPService &service = *(it->second);

+               service.SetTimeout(TimeOut);

+               service.SetSID(newSID);

+               msg2 << "Re-subscribed to EventURL '" <<

+-                  GET_UPNP_STRING(es_event->PublisherUrl) <<

++                  publisherUrl <<

+                   "' with SID == '" <<

+                   newSID << "'.";

+               AddDebugLogLineC(logUPnP, msg2);

+@@ -1321,17 +1331,19 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

+   case UPNP_CONTROL_ACTION_COMPLETE: {

+       //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");

+       // This is here if we choose to do this asynchronously

+-      struct Upnp_Action_Complete *a_event =

+-          (struct Upnp_Action_Complete *)Event;

+-      if (a_event->ErrCode != UPNP_E_SUCCESS) {

++      UpnpActionComplete *a_event = (UpnpActionComplete *)Event;

++      int errCode = UpnpActionComplete_get_ErrCode(a_event);

++      IXML_Document *actionResult =

++          UpnpActionComplete_get_ActionResult(a_event);

++      if (errCode != UPNP_E_SUCCESS) {

+           UPnP::ProcessErrorMessage(

+               "UpnpSendActionAsync",

+-              a_event->ErrCode, NULL,

+-              a_event->ActionResult);

++              errCode, NULL,

++              actionResult);

+       } else {

+           // Check the response document

+           UPnP::ProcessActionResponse(

+-              a_event->ActionResult,

++              actionResult,

+               "<UpnpSendActionAsync>");

+       }

+       /* No need for any processing here, just print out results.

+@@ -1342,21 +1354,25 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*

+   case UPNP_CONTROL_GET_VAR_COMPLETE: {

+       //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");

+       msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";

+-      struct Upnp_State_Var_Complete *sv_event =

+-          (struct Upnp_State_Var_Complete *)Event;

+-      if (sv_event->ErrCode != UPNP_E_SUCCESS) {

++      UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;

++      int errCode = UpnpStateVarComplete_get_ErrCode(sv_event);

++      if (errCode != UPNP_E_SUCCESS) {

+           msg << "m_UpnpGetServiceVarStatusAsync";

+           UPnP::ProcessErrorMessage(

+-              msg.str(), sv_event->ErrCode, NULL, NULL);

++              msg.str(), errCode, NULL, NULL);

+       } else {

+ #if 0

+           // Warning: The use of UpnpGetServiceVarStatus and

+           // UpnpGetServiceVarStatusAsync is deprecated by the

+           // UPnP forum.

++          const char *ctrlUrl =

++              UpnpStateVarComplete_get_CtrlUrl(sv_event);

++          const char *stateVarName =

++              UpnpStateVarComplete_get_StateVarName(sv_event);

++          const DOMString currentVal =

++              UpnpStateVarComplete_get_CurrentVal(sv_event);

+           TvCtrlPointHandleGetVar(

+-              sv_event->CtrlUrl,

+-              sv_event->StateVarName,

+-              sv_event->CurrentVal );

++              ctrlUrl, stateVarName, currentVal);

+ #endif

+       }

+       break;

+diff --git a/src/UPnPBase.h b/src/UPnPBase.h

+index 9eafbd143..92753b86a 100644

+--- a/src/UPnPBase.h

++++ b/src/UPnPBase.h

+@@ -489,9 +489,9 @@ class CUPnPControlPoint

+ 

+   // Callback function

+   static int Callback(

+-      Upnp_EventType EventType,

+-      void* Event,

+-      void* Cookie);

++      Upnp_EventType_e EventType,

++      const void *Event,

++      void *Cookie);

+ 

+ private:

+   void OnEventReceived(

+

+From 9ee7158249a957891c0e115faa88ced05f77bf38 Mon Sep 17 00:00:00 2001

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

+Date: Wed, 3 Oct 2018 14:24:28 -0300

+Subject: [PATCH 3/3] Make libupnp.m4 work with lib64 directories too

+

+---

+ m4/libupnp.m4 | 13 +++++++++----

+ 1 file changed, 9 insertions(+), 4 deletions(-)

+

+diff --git a/m4/libupnp.m4 b/m4/libupnp.m4

+index f340a4da9..a9e08dbc9 100644

+--- a/m4/libupnp.m4

++++ b/m4/libupnp.m4

+@@ -45,11 +45,16 @@ m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl

+ 

+ dnl   Test for --with-libupnp-prefix

+   AC_ARG_WITH(

+-      [libupnp-prefix],

+-      [AS_HELP_STRING(

++      [libupnp-prefix],[

++      AS_HELP_STRING(

+           [--with-libupnp-prefix=PREFIX],

+-          [UPnP library location])],

+-      [export PKG_CONFIG_PATH=$withval/lib/pkgconfig])

++          [UPnP library location])],[

++      AS_IF([test -d "$withval/lib64/pkgconfig"],[

++          export PKG_CONFIG_PATH=$withval/lib64/pkgconfig

++      ],[

++          export PKG_CONFIG_PATH=$withval/lib/pkgconfig

++      ])

++  ])

+ 

+ dnl   Check for libupnp >= MIN_LIBUPNP_VERSION

+   AS_IF([test $cross_compiling = no], [

​