From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH] transmission: Update to version 4.0.3 Date: Tue, 30 May 2023 16:16:50 +0200 Message-ID: <49c175a2-1291-6049-fefa-a3dc63673871@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8793061907637391231==" List-Id: --===============8793061907637391231== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Arne, From transmission-4.0.0 onwards the web gui has been rewritten in JavaScript= and no longer uses jQuery. In the rootfile there is now /usr/share/transmission/public_html/transmission= -app.js together with index.html and I believe that this combination is what = is now the web gui for remote access. Regards, Adolf. On 30/05/2023 12:48, Adolf Belka wrote: > Hi Arne, > > > I just tried installing transmission-3.00 and have seen that although the w= eb related files are all commented out, they are installed because the /usr/s= hare/transmission directory is not commented out. > > I have also seen that in the wiki page it talks about the web gui so clearl= y this is intended to be present. > > I have looked in the transmission source in the file CMakeLists.txt and it = refers to the option INSTALL_WEB but says that the default is ON, so this sho= uld happen automatically. I will try setting this option explicitly to ON in = the lfs. > > Also the ENABLE_CLI option is defined as OFF by default. I had left this ou= t as in the version-3.00 configure it has the --enable-cli in the Optional Fe= atures section. It does not mention any default but usually if it is optional= without a specified default it means that it is disabled if not explicitly s= pecified but maybe in the transmission case an optional parameter that has no= default means that it is built. > > I will also try enabling the cli with the cmake command. Maybe the INSTALL_= WEB is not applied if the ENABLE_CLI is not turned on. > > Will report back on what I find. > > Regards, > > Adolf. > > > On 30/05/2023 12:00, Adolf Belka wrote: >> Hi Arne, >> >> On 30/05/2023 08:06, Arne Fitzenreiter wrote: >>> The files of the webgui are now commented out. Please check: >>> #usr/share/transmission >> >> The files were commented out in the version 3.00 rootfile. >> >> In the version 4.0.3 rootfile the webgui items are not even present. >> >> I didn't worry too much about that as my understanding is that transmissio= n is a client only, not a server so it should not need a webgui anyway. >> >> However if the torrent client requires a webgui then I can look and see if= the cmake build can have the webgui enabled. Probably the webgui is no longe= r enabled by default with cmake as compared with the configure approach. >> >> >> Regards, >> Adolf. >>> >>> Arne >>> >>> >>> Am 2023-05-20 14:10, schrieb Adolf Belka: >>>> - Update from version 3.00 to 4.0.3 >>>> - Update of rootfile >>>> - Build changed from autotools configure to cmake >>>> - Changelog is very large. For details see >>>> =C2=A0=C2=A0 https://github.com/transmission/transmission/releases/ >>>> >>>> Signed-off-by: Adolf Belka >>>> --- >>>> =C2=A0config/rootfiles/packages/transmission | 94 +++-------------------= ---- >>>> =C2=A0lfs/transmission=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 | 15 ++-- >>>> =C2=A02 files changed, 18 insertions(+), 91 deletions(-) >>>> >>>> diff --git a/config/rootfiles/packages/transmission >>>> b/config/rootfiles/packages/transmission >>>> index d831ecde9..69bc9a1d7 100644 >>>> --- a/config/rootfiles/packages/transmission >>>> +++ b/config/rootfiles/packages/transmission >>>> @@ -1,3 +1,4 @@ >>>> +etc/rc.d/init.d/transmission >>>> =C2=A0#etc/transmission >>>> =C2=A0etc/transmission/settings.json >>>> =C2=A0usr/bin/transmission-create >>>> @@ -5,88 +6,13 @@ usr/bin/transmission-daemon >>>> =C2=A0usr/bin/transmission-edit >>>> =C2=A0usr/bin/transmission-remote >>>> =C2=A0usr/bin/transmission-show >>>> -#usr/share/man/man1/transmission-create.1 >>>> -#usr/share/man/man1/transmission-daemon.1 >>>> -#usr/share/man/man1/transmission-edit.1 >>>> -#usr/share/man/man1/transmission-remote.1 >>>> -#usr/share/man/man1/transmission-show.1 >>>> -usr/share/transmission >>>> -#usr/share/transmission/web >>>> -#usr/share/transmission/web/LICENSE >>>> -#usr/share/transmission/web/images >>>> -#usr/share/transmission/web/images/favicon.ico >>>> -#usr/share/transmission/web/images/favicon.png >>>> -#usr/share/transmission/web/images/webclip-icon.png >>>> -#usr/share/transmission/web/index.html >>>> -#usr/share/transmission/web/javascript >>>> -#usr/share/transmission/web/javascript/common.js >>>> -#usr/share/transmission/web/javascript/dialog.js >>>> -#usr/share/transmission/web/javascript/file-row.js >>>> -#usr/share/transmission/web/javascript/formatter.js >>>> -#usr/share/transmission/web/javascript/inspector.js >>>> -#usr/share/transmission/web/javascript/jquery >>>> -#usr/share/transmission/web/javascript/jquery/jquery-migrate.min.js >>>> -#usr/share/transmission/web/javascript/jquery/jquery-ui.min.js >>>> -#usr/share/transmission/web/javascript/jquery/jquery.min.js >>>> -#usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js >>>> -#usr/share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min= .js >>>> -#usr/share/transmission/web/javascript/jquery/json2.min.js >>>> -#usr/share/transmission/web/javascript/main.js >>>> -#usr/share/transmission/web/javascript/notifications.js >>>> -#usr/share/transmission/web/javascript/polyfill.js >>>> -#usr/share/transmission/web/javascript/prefs-dialog.js >>>> -#usr/share/transmission/web/javascript/remote.js >>>> -#usr/share/transmission/web/javascript/torrent-row.js >>>> -#usr/share/transmission/web/javascript/torrent.js >>>> -#usr/share/transmission/web/javascript/transmission.js >>>> -#usr/share/transmission/web/style >>>> -#usr/share/transmission/web/style/jqueryui >>>> -#usr/share/transmission/web/style/jqueryui/images >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_flat_0_aaaaaa_4= 0x100.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_= 40x100.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_55_fbf9ee= _1x400.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff= _1x400.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada= _1x400.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6= _1x400.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_95_fef1ec= _1x400.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_= 75_cccccc_1x100.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-icons_222222_256x2= 40.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-icons_2e83ff_256x2= 40.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-icons_454545_256x2= 40.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-icons_888888_256x2= 40.png >>>> -#usr/share/transmission/web/style/jqueryui/images/ui-icons_cd0a0a_256x2= 40.png >>>> -#usr/share/transmission/web/style/jqueryui/jquery-ui.min.css >>>> -#usr/share/transmission/web/style/transmission >>>> -#usr/share/transmission/web/style/transmission/common.css >>>> -#usr/share/transmission/web/style/transmission/images >>>> -#usr/share/transmission/web/style/transmission/images/arrow-down.png >>>> -#usr/share/transmission/web/style/transmission/images/arrow-up.png >>>> -#usr/share/transmission/web/style/transmission/images/blue-turtle.png >>>> -#usr/share/transmission/web/style/transmission/images/buttons >>>> -#usr/share/transmission/web/style/transmission/images/buttons/torrent_b= uttons.png >>>> -#usr/share/transmission/web/style/transmission/images/compact.png >>>> -#usr/share/transmission/web/style/transmission/images/file-priority-hig= h.png >>>> -#usr/share/transmission/web/style/transmission/images/file-priority-low= .png >>>> -#usr/share/transmission/web/style/transmission/images/file-priority-nor= mal.png >>>> -#usr/share/transmission/web/style/transmission/images/filter_bar.png >>>> -#usr/share/transmission/web/style/transmission/images/filter_icon.png >>>> -#usr/share/transmission/web/style/transmission/images/inspector-files.p= ng >>>> -#usr/share/transmission/web/style/transmission/images/inspector-info.png >>>> -#usr/share/transmission/web/style/transmission/images/inspector-peers.p= ng >>>> -#usr/share/transmission/web/style/transmission/images/inspector-tracker= s.png >>>> -#usr/share/transmission/web/style/transmission/images/lock_icon.png >>>> -#usr/share/transmission/web/style/transmission/images/logo.png >>>> -#usr/share/transmission/web/style/transmission/images/progress.png >>>> -#usr/share/transmission/web/style/transmission/images/settings.png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-close.png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-folder.png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-info.png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-pause-all= .png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-pause.png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-start-all= .png >>>> -#usr/share/transmission/web/style/transmission/images/toolbar-start.png >>>> -#usr/share/transmission/web/style/transmission/images/turtle.png >>>> -#usr/share/transmission/web/style/transmission/images/wrench.png >>>> -#usr/share/transmission/web/style/transmission/mobile.css >>>> +#usr/share/transmission >>>> +#usr/share/transmission/public_html >>>> +#usr/share/transmission/public_html/images >>>> +#usr/share/transmission/public_html/images/favicon.ico >>>> +#usr/share/transmission/public_html/images/favicon.png >>>> +#usr/share/transmission/public_html/images/webclip-icon.png >>>> +#usr/share/transmission/public_html/index.html >>>> +#usr/share/transmission/public_html/transmission-app.js >>>> +#usr/share/transmission/public_html/transmission-app.js.LICENSE.txt >>>> =C2=A0var/ipfire/backup/addons/includes/transmission >>>> -etc/rc.d/init.d/transmission >>>> diff --git a/lfs/transmission b/lfs/transmission >>>> index ea1167da4..4e0667353 100644 >>>> --- a/lfs/transmission >>>> +++ b/lfs/transmission >>>> @@ -1,7 +1,7 @@ >>>> >>>> ########################################################################= ####### >>>> =C2=A0# =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> =C2=A0# IPFire.org - A linux based firewall =C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 # >>>> -# Copyright (C) 2007-2020=C2=A0 IPFire Team =C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> +# Copyright (C) 2007-2023=C2=A0 IPFire Team =C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> =C2=A0# =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> =C2=A0# This program is free software: you can redistribute it and/or mo= dify =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> =C2=A0# it under the terms of the GNU General Public License as publishe= d by =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # >>>> @@ -26,7 +26,7 @@ include Config >>>> >>>> =C2=A0SUMMARY=C2=A0=C2=A0=C2=A0 =3D A BitTorrent client with multiple UIs >>>> >>>> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 3.00 >>>> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 4.0.3 >>>> >>>> =C2=A0THISAPP=C2=A0=C2=A0=C2=A0 =3D transmission-$(VER) >>>> =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.xz >>>> @@ -34,14 +34,12 @@ DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE) >>>> =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP) >>>> =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP) >>>> =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D transmission >>>> -PAK_VER=C2=A0=C2=A0=C2=A0 =3D 18 >>>> +PAK_VER=C2=A0=C2=A0=C2=A0 =3D 19 >>>> >>>> =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D >>>> >>>> =C2=A0SERVICES=C2=A0=C2=A0 =3D transmission >>>> >>>> -CXXFLAGS=C2=A0 +=3D -fno-exceptions >>>> - >>>> >>>> ########################################################################= ####### >>>> =C2=A0# Top-level Rules >>>> >>>> ########################################################################= ####### >>>> @@ -50,7 +48,7 @@ objects =3D $(DL_FILE) >>>> >>>> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>>> >>>> -$(DL_FILE)_BLAKE2 =3D >>>> 108c9acb8e8cb9c037ea96ca25f32c8421a6981b613399c73e2cd597dd1b529409329fa3= c327630c164db05d8b3da81e634941bca08c7e258bb2d283782b9906 >>>> +$(DL_FILE)_BLAKE2 =3D >>>> 3d58f002d57458869e143e4a3617c8992e51a01f15f0e17031bc2913f404a455cde3397b= de404f84a2234d12411e99b2902e4213ca6811b95288bb68f9b98553 >>>> >>>> =C2=A0install : $(TARGET) >>>> >>>> @@ -83,7 +81,10 @@ $(subst %,%_BLAKE2,$(objects)) : >>>> =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 @$(PREBUILD) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf = $(DIR_DL)/$(DL_FILE) >>>> -=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && ./configure --prefix=3D/usr --disab= le-static >>>> +=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && cmake . \ >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -DCM= AKE_INSTALL_PREFIX=3D/usr \ >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -DCM= AKE_BUILD_TYPE=3DRelease \ >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -DIN= STALL_DOC=3DOFF >>>> =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAK= E) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make install --===============8793061907637391231==--