Re: [PATCH 2/3] libupnp: Update to 1.14.5

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4720 bytes --]

Hi Michael,

On 12/04/2021 13:17, Adolf Belka wrote:
> Hi Michael,
>
> On 12/04/2021 11:53, Michael Tremer wrote:
>> Hello,
>>
>> This patch contains an “soname bump”, i.e. libupnp.so.6 has become libupnp.so.11.
>>
>> Anything that is linked against the former won’t be able to use the latter version. Normally this can be checked with “./make.sh find-dependencies”, but I currently do not have a full build environment on my build machine (trying to build loads of other things).
> Was not aware of the find-dependencies option. Thanks for letting me know.
>>
>> Just wanted to drop a note so that you are aware :)
> As you don't have a full build environment available at the moment should I carry that out?
>
Thought I would give it a try anyway to see how to do it, especially as you don't have a free build system to use currently.

I did a git pull origin next to update my git repository to the latest IPFire next status.

I then did a ./make.sh clean followed by ./make.sh build

I then ran ./make.sh find-dependencies /usr/lib libupnp.so.6

Nothing came back on the command line.

I then ran ./make.sh find-dependencies /usr/lib libupnp.so.17

It came back with ipfire-2.x/build/usr/bin/mpd and nothing else.

Presuming that I had the correct format for the find-dependencies command then it looks like everything is okay. If the command is not correct then let me know what I should be using and I will have another go.

Regards,

Adolf.

> Adolf.
>>
>> -Michael
>>
>>> On 9 Apr 2021, at 20:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>
>>> - Update from 1.6.18 to 1.14.5
>>> - Update required for successfgul build of mpd-0.22.6
>>> - Update of rootfile
>>> - Changelog is too large to include here
>>>    Full details can be found in the ChangeLog file in the source tarball
>>>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
>>> lfs/libupnp                     |  4 ++--
>>> 2 files changed, 20 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
>>> index cec62c463..d5b6f5df0 100644
>>> --- a/config/rootfiles/common/libupnp
>>> +++ b/config/rootfiles/common/libupnp
>>> @@ -1,34 +1,37 @@
>>> #usr/include/upnp
>>> -#usr/include/upnp/FreeList.h
>>> -#usr/include/upnp/LinkedList.h
>>> -#usr/include/upnp/ThreadPool.h
>>> -#usr/include/upnp/TimerThread.h
>>> +#usr/include/upnp/Callback.h
>>> +#usr/include/upnp/UpnpActionComplete.h
>>> +#usr/include/upnp/UpnpActionRequest.h
>>> +#usr/include/upnp/UpnpDiscovery.h
>>> +#usr/include/upnp/UpnpEvent.h
>>> +#usr/include/upnp/UpnpEventSubscribe.h
>>> +#usr/include/upnp/UpnpExtraHeaders.h
>>> +#usr/include/upnp/UpnpFileInfo.h
>>> #usr/include/upnp/UpnpGlobal.h
>>> #usr/include/upnp/UpnpInet.h
>>> #usr/include/upnp/UpnpIntTypes.h
>>> +#usr/include/upnp/UpnpStateVarComplete.h
>>> +#usr/include/upnp/UpnpStateVarRequest.h
>>> #usr/include/upnp/UpnpStdInt.h
>>> #usr/include/upnp/UpnpString.h
>>> +#usr/include/upnp/UpnpSubscriptionRequest.h
>>> #usr/include/upnp/UpnpUniStd.h
>>> #usr/include/upnp/ithread.h
>>> #usr/include/upnp/ixml.h
>>> #usr/include/upnp/ixmldebug.h
>>> +#usr/include/upnp/list.h
>>> #usr/include/upnp/upnp.h
>>> #usr/include/upnp/upnpconfig.h
>>> #usr/include/upnp/upnpdebug.h
>>> #usr/include/upnp/upnptools.h
>>> #usr/lib/libixml.a
>>> #usr/lib/libixml.la
>>> -usr/lib/libixml.so
>>> -usr/lib/libixml.so.2
>>> -usr/lib/libixml.so.2.0.8
>>> -#usr/lib/libthreadutil.a
>>> -#usr/lib/libthreadutil.la
>>> -usr/lib/libthreadutil.so
>>> -usr/lib/libthreadutil.so.6
>>> -usr/lib/libthreadutil.so.6.0.3
>>> +#usr/lib/libixml.so
>>> +usr/lib/libixml.so.11
>>> +usr/lib/libixml.so.11.0.1
>>> #usr/lib/libupnp.a
>>> #usr/lib/libupnp.la
>>> -usr/lib/libupnp.so
>>> -usr/lib/libupnp.so.6
>>> -usr/lib/libupnp.so.6.3.2
>>> +#usr/lib/libupnp.so
>>> +usr/lib/libupnp.so.17
>>> +usr/lib/libupnp.so.17.0.5
>>> #usr/lib/pkgconfig/libupnp.pc
>>> diff --git a/lfs/libupnp b/lfs/libupnp
>>> index 683a887ad..90cb48b84 100644
>>> --- a/lfs/libupnp
>>> +++ b/lfs/libupnp
>>> @@ -24,7 +24,7 @@
>>>
>>> include Config
>>>
>>> -VER        = 1.6.18
>>> +VER        = 1.14.5
>>>
>>> THISAPP    = libupnp-$(VER)
>>> DL_FILE    = $(THISAPP).tar.bz2
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>>
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>
>>> -$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
>>> +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
>>>
>>> install : $(TARGET)
>>>
>>> -- 
>>> 2.31.1
>>>
>>