Skip to contentSkip to conversation

package/transmission: bump version to 2.9.4

PATCH New Bernd Kuhls 3 participants 10 messages May 2, 2018 – Jun 11, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/4 package/transmission: bump version to 2.9.4

Removed patch 0003, a different fix was committed upstream:
https://github.com/transmission/transmission/commit/b21a6140e963491f146293c9b0a2863a9ae99ad3

Renumbered remaining patches.

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...tp-include.patch => 0003-fix-utp-include.patch} |  0
 package/transmission/0003-miniupnpc-cross.patch    | 31 ----------------------
 ...nce-1.0.18-has-sys-quota.h-synced-with-G.patch} |  0
 ...0006-libsystemd.patch => 0005-libsystemd.patch} |  0
 package/transmission/transmission.hash             |  2 +-
 package/transmission/transmission.mk               |  2 +-
 6 files changed, 2 insertions(+), 33 deletions(-)
 rename package/transmission/{0004-fix-utp-include.patch => 0003-fix-utp-include.patch} (100%)
 delete mode 100644 package/transmission/0003-miniupnpc-cross.patch
 rename package/transmission/{0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch => 0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch} (100%)
 rename package/transmission/{0006-libsystemd.patch => 0005-libsystemd.patch} (100%)
package/transmission/0003-fix-utp-include.patch renamed from package/transmission/0004-fix-utp-include.patch +0 -0
similarity index 100%
rename from package/transmission/0004-fix-utp-include.patch
rename to package/transmission/0003-fix-utp-include.patch
package/transmission/0003-miniupnpc-cross.patch deleted +0 -31
deleted file mode 100644
index 5037c2e67a..0000000000
@@ -1,31 +0,0 @@
-Fix libminiupnpc version detection
-
-Problem is known upstream: https://trac.transmissionbt.com/ticket/6140
-
-For buildroot we know the libminiupnpc version so we hard-code 2.0.
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac
---- transmission-2.92.org/configure.ac	2016-03-06 21:23:45.336198393 +0100
-+++ transmission-2.92/configure.ac	2016-07-02 21:48:13.452385686 +0200
-@@ -386,18 +386,7 @@
- dnl MINIUPNPC_API_VERSION and we won't have to figure
- dnl it out on our own
- if test "x$upnp_version" = "xunknown" ; then
--  AC_RUN_IFELSE(
--    [AC_LANG_PROGRAM(
--      [#include <stdlib.h>
--       #include <miniupnpc/miniupnpc.h>],
--      [#ifdef MINIUPNPC_API_VERSION
--       return EXIT_SUCCESS;
--       #else
--       return EXIT_FAILURE;
--       #endif]
--    )],
--    [upnp_version=">= 1.7"]
--  )
-+  upnp_version="2.0"
- fi
- 
- dnl Or maybe it's miniupnp 1.6
package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch renamed from package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch +0 -0
similarity index 100%
rename from package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
rename to package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
package/transmission/0005-libsystemd.patch renamed from package/transmission/0006-libsystemd.patch +0 -0
similarity index 100%
rename from package/transmission/0006-libsystemd.patch
rename to package/transmission/0005-libsystemd.patch
package/transmission/transmission.hash +1 -1
index 4c1c3f9a3a..0d2af32f4f 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b  transmission-2.93.tar.xz
+sha256 35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d  transmission-2.94.tar.xz
 sha256 20801783bf59e27d03ed6aab625b32a34e221ae95bf801db87827c8023398495  COPYING
package/transmission/transmission.mk +1 -1
index 4e78604fdb..640c78c650 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRANSMISSION_VERSION = 2.93
+TRANSMISSION_VERSION = 2.94
 TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master
 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz
 TRANSMISSION_DEPENDENCIES = \
Signature · 1 line
2.14.2
author
#1 lore raw

PATCH 2/4 package/transmission: fix systemd support

Patch 0005-libsystemd.patch backports an upstream commit which renames the systemd configure option.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/transmission/transmission.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/transmission/transmission.mk +2 -2
index 640c78c650..f15d037266 100644
@@ -49,9 +49,9 @@ TRANSMISSION_CONF_OPTS += --enable-daemon
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 TRANSMISSION_DEPENDENCIES += systemd
-TRANSMISSION_CONF_OPTS += --with-systemd-daemon
+TRANSMISSION_CONF_OPTS += --with-systemd
 else
-TRANSMISSION_CONF_OPTS += --without-systemd-daemon
+TRANSMISSION_CONF_OPTS += --without-systemd
 endif
 
 define TRANSMISSION_USERS
Signature · 1 line
2.14.2
#2 lore raw

PATCH 2/4 package/transmission: fix systemd support

Hello,

Quoted 7 lines · Bernd Kuhls

Patch 0005-libsystemd.patch backports an upstream commit which renames the systemd configure option.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/transmission/transmission.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

The order of the patches in your patch series is not very good. Indeed, patches 2/4, 3/4 and 4/4 are fixing problems that exist *today* in Buildroot, with the current version of transmission being packaged. Therefore, they should appear first in the series, before the bump.

This is even more relevant right now, as patches 2/4, 3/4 and 4/4 should be applied to master, while patch 1/4 is only for next.

So, I've applied this patch to master, after fixing the commit log to mention 0006-libsystemd.patch, since the patch is named this way in master.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/4 package/transmission: fix systemd support

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 7 lines · Bernd Kuhls

Patch 0005-libsystemd.patch backports an upstream commit which renames the systemd configure option.

Signed-off-by Bernd Kuhls <[email protected]>

---
package/transmission/transmission.mk | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

The order of the patches in your patch series is not very good. Indeed, patches 2/4, 3/4 and 4/4 are fixing problems that exist *today* in Buildroot, with the current version of transmission being packaged. Therefore, they should appear first in the series, before the bump.

Quoted 6 lines

This is even more relevant right now, as patches 2/4, 3/4 and 4/4 should be applied to master, while patch 1/4 is only for next.

So, I've applied this patch to master, after fixing the commit log to mention 0006-libsystemd.patch, since the patch is named this way in master.

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#4 lore raw

PATCH 3/4 package/transmission: fix inotify configure option

In reply to Bernd Kuhls

The configure option is really called --with-inotify:
https://github.com/transmission/transmission/blob/2.9x/configure.ac#L211

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/transmission/transmission.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/transmission/transmission.mk +1 -1
index f15d037266..cb1b8f6cdd 100644
@@ -16,7 +16,7 @@ TRANSMISSION_DEPENDENCIES = \
 	zlib
 TRANSMISSION_AUTORECONF = YES
 TRANSMISSION_CONF_OPTS = \
-	--disable-libnotify \
+	--without-inotify \
 	--enable-lightweight
 TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception
 TRANSMISSION_LICENSE_FILES = COPYING
Signature · 1 line
2.14.2
Applied
#5 lore raw

PATCH 3/4 package/transmission: fix inotify configure option

Hello,

Quoted 7 lines · Bernd Kuhls

The configure option is really called --with-inotify:
https://github.com/transmission/transmission/blob/2.9x/configure.ac#L211

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/transmission/transmission.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 3/4 package/transmission: fix inotify configure option

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 7 lines · Bernd Kuhls

The configure option is really called --with-inotify:
https://github.com/transmission/transmission/blob/2.9x/configure.ac#L211

Signed-off-by Bernd Kuhls <[email protected]>

---
package/transmission/transmission.mk | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 4/4 package/transmission: remove BR2_PACKAGE_TRANSMISSION_REMOTE

In reply to Bernd Kuhls

Upstream does not provide a configure option --enable-remote.

Signed-off-by Bernd Kuhls <[email protected]>
---
 Config.in.legacy                     | 7 +++++++
 package/transmission/Config.in       | 5 -----
 package/transmission/transmission.mk | 6 ------
 3 files changed, 7 insertions(+), 11 deletions(-)
Config.in.legacy +7 -0
index 3d8b28c5fe..418bac3898 100644
@@ -145,6 +145,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_TRANSMISSION_REMOTE
+	bool "transmission remote tool option removed"
+	select BR2_LEGACY
+	help
+	  Upstream does not provide a configure option for the tool
+	  transmission-remote
+
 config BR2_PACKAGE_IQVLINUX
 	bool "iqvlinux package removed"
 	select BR2_LEGACY
package/transmission/Config.in +0 -5
index 2110e52ac6..dac4d1b330 100644
@@ -32,11 +32,6 @@ config BR2_PACKAGE_TRANSMISSION_DAEMON
 	help
 	  Install transmission daemon.
 
-config BR2_PACKAGE_TRANSMISSION_REMOTE
-	bool "transmission-remote"
-	help
-	  Install transmission remote management tool.
-
 config BR2_PACKAGE_TRANSMISSION_GTK
 	bool "transmission-gtk"
 	depends on BR2_PACKAGE_LIBGTK3 && BR2_SYSTEM_ENABLE_NLS
package/transmission/transmission.mk +0 -6
index cb1b8f6cdd..00652e7f4c 100644
@@ -75,12 +75,6 @@ else
 TRANSMISSION_CONF_OPTS += --disable-daemon
 endif
 
-ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y)
-TRANSMISSION_CONF_OPTS += --enable-remote
-else
-TRANSMISSION_CONF_OPTS += --disable-remote
-endif
-
 ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y)
 TRANSMISSION_CONF_OPTS += --with-gtk
 TRANSMISSION_DEPENDENCIES += libgtk3
Signature · 1 line
2.14.2
Applied
#8 lore raw

PATCH 4/4 package/transmission: remove BR2_PACKAGE_TRANSMISSION_REMOTE

Hello,

Quoted 8 lines · Bernd Kuhls

Upstream does not provide a configure option --enable-remote.

Signed-off-by Bernd Kuhls <[email protected]>
---
 Config.in.legacy                     | 7 +++++++
 package/transmission/Config.in       | 5 -----
 package/transmission/transmission.mk | 6 ------
 3 files changed, 7 insertions(+), 11 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
Applied
#9 lore raw

PATCH 1/4 package/transmission: bump version to 2.9.4

In reply to Bernd Kuhls

Hello,

Quoted 6 lines · Bernd Kuhls

Removed patch 0003, a different fix was committed upstream:
https://github.com/transmission/transmission/commit/b21a6140e963491f146293c9b0a2863a9ae99ad3

Renumbered remaining patches.

Signed-off-by Bernd Kuhls <[email protected]>
Quoted 12 lines
---
 ...tp-include.patch => 0003-fix-utp-include.patch} |  0
 package/transmission/0003-miniupnpc-cross.patch    | 31 ----------------------
 ...nce-1.0.18-has-sys-quota.h-synced-with-G.patch} |  0
 ...0006-libsystemd.patch => 0005-libsystemd.patch} |  0
 package/transmission/transmission.hash             |  2 +-
 package/transmission/transmission.mk               |  2 +-
 6 files changed, 2 insertions(+), 33 deletions(-)
 rename package/transmission/{0004-fix-utp-include.patch => 0003-fix-utp-include.patch} (100%)
 delete mode 100644 package/transmission/0003-miniupnpc-cross.patch
 rename package/transmission/{0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch => 0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch} (100%)
 rename package/transmission/{0006-libsystemd.patch => 0005-libsystemd.patch} (100%)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com