diff mbox series

[1/1] package/gpsd: bump to version 3.25

Message ID 20230114181556.1371822-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/gpsd: bump to version 3.25 | expand

Commit Message

Fabrice Fontaine Jan. 14, 2023, 6:15 p.m. UTC
Drop patch (not needed anymore)

https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../gpsd/0001-gpsctl-fix-yodaification.patch  | 44 -------------------
 package/gpsd/gpsd.hash                        |  2 +-
 package/gpsd/gpsd.mk                          |  2 +-
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 package/gpsd/0001-gpsctl-fix-yodaification.patch

Comments

Yann E. MORIN Jan. 16, 2023, 6:40 a.m. UTC | #1
Fabrice, All,

On 2023-01-14 19:15 +0100, Fabrice Fontaine spake thusly:
> Drop patch (not needed anymore)
> 
> https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS

Hmm.. Why did I not receive the weekly mail informing me the package got
updated?

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Tested with a u-blox Neo M8N

Tested-by: Yann E. MORIN <yann.morin@orange.com>
Acked-by: Yann E. MORIN <yann.morin@orange.com>

Regards,
Yann E. MORIN.

> ---
>  .../gpsd/0001-gpsctl-fix-yodaification.patch  | 44 -------------------
>  package/gpsd/gpsd.hash                        |  2 +-
>  package/gpsd/gpsd.mk                          |  2 +-
>  3 files changed, 2 insertions(+), 46 deletions(-)
>  delete mode 100644 package/gpsd/0001-gpsctl-fix-yodaification.patch
> 
> diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch
> deleted file mode 100644
> index 753ff300eb..0000000000
> --- a/package/gpsd/0001-gpsctl-fix-yodaification.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001
> -Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin@orange.com>
> -From: "Yann E. MORIN" <yann.morin@orange.com>
> -Date: Tue, 13 Sep 2022 15:10:48 +0200
> -Subject: [PATCH] gpsctl: fix yodaification
> -
> -Commit d5a672abd98a (gpsctl.c: Style tweaks.  Yoda style, braces, //
> -comments.) claimed "No functional changes", but mis-treated a comparison
> -when it was converted to yoda-style (simplified diff):
> -
> -    -    if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) {
> -    +    if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) {
> -
> -As one may notice, the comparison operator was not reversed while the
> -operands were.
> -
> -This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at
> ---ship sending commands to running gpsd.) but this is completely
> -unrelated.
> -
> -Fix that comparison.
> -
> -Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> -Upstream status: not applicable as already fixed.
> ----
> - gpsctl.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/gpsctl.c b/gpsctl.c
> -index cb342af87..ef59a6622 100644
> ---- a/gpsctl.c
> -+++ b/gpsctl.c
> -@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata,
> -     if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) {
> -         (void)strlcat(buf, "\n", sizeof(buf));
> -     }
> --    if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) {
> -+    if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) {
> -         GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n");
> -         return false;
> -     }
> --- 
> -2.25.1
> -
> diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash
> index f415c3af0f..15e1181ed9 100644
> --- a/package/gpsd/gpsd.hash
> +++ b/package/gpsd/gpsd.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c  gpsd-3.24.tar.gz
> +sha256  b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2  gpsd-3.25.tar.gz
>  sha256  fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716  COPYING
> diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
> index 961ebde649..d7425513fd 100644
> --- a/package/gpsd/gpsd.mk
> +++ b/package/gpsd/gpsd.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -GPSD_VERSION = 3.24
> +GPSD_VERSION = 3.25
>  GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
>  GPSD_LICENSE = BSD-2-Clause
>  GPSD_LICENSE_FILES = COPYING
> -- 
> 2.39.0
>
Yann E. MORIN Jan. 16, 2023, 8:15 a.m. UTC | #2
Thomas, All,

On 2023-01-16 07:40 +0100, MORIN Yann INNOV/IT-S spake thusly:
> On 2023-01-14 19:15 +0100, Fabrice Fontaine spake thusly:
> > Drop patch (not needed anymore)
> > https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS
> Hmm.. Why did I not receive the weekly mail informing me the package got
> updated?

Probably because it was released after the mail was sent last week:
I did get the reminder today.

Regards,
Yann E. MORIN.
Peter Korsgaard Feb. 6, 2023, 9:59 a.m. UTC | #3
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Drop patch (not needed anymore)
 > https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch
deleted file mode 100644
index 753ff300eb..0000000000
--- a/package/gpsd/0001-gpsctl-fix-yodaification.patch
+++ /dev/null
@@ -1,44 +0,0 @@ 
-From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001
-Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin@orange.com>
-From: "Yann E. MORIN" <yann.morin@orange.com>
-Date: Tue, 13 Sep 2022 15:10:48 +0200
-Subject: [PATCH] gpsctl: fix yodaification
-
-Commit d5a672abd98a (gpsctl.c: Style tweaks.  Yoda style, braces, //
-comments.) claimed "No functional changes", but mis-treated a comparison
-when it was converted to yoda-style (simplified diff):
-
-    -    if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) {
-    +    if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) {
-
-As one may notice, the comparison operator was not reversed while the
-operands were.
-
-This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at
---ship sending commands to running gpsd.) but this is completely
-unrelated.
-
-Fix that comparison.
-
-Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
-Upstream status: not applicable as already fixed.
----
- gpsctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gpsctl.c b/gpsctl.c
-index cb342af87..ef59a6622 100644
---- a/gpsctl.c
-+++ b/gpsctl.c
-@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata,
-     if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) {
-         (void)strlcat(buf, "\n", sizeof(buf));
-     }
--    if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) {
-+    if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) {
-         GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n");
-         return false;
-     }
--- 
-2.25.1
-
diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash
index f415c3af0f..15e1181ed9 100644
--- a/package/gpsd/gpsd.hash
+++ b/package/gpsd/gpsd.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256  00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c  gpsd-3.24.tar.gz
+sha256  b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2  gpsd-3.25.tar.gz
 sha256  fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716  COPYING
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 961ebde649..d7425513fd 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-GPSD_VERSION = 3.24
+GPSD_VERSION = 3.25
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
 GPSD_LICENSE = BSD-2-Clause
 GPSD_LICENSE_FILES = COPYING