[PR PATCH] OTPClient: update to 2.4.4

[PR PATCH] OTPClient: update to 2.4.4

[FollieHiyuki]

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

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages otpclient-update
https://github.com/void-linux/void-packages/pull/30530

OTPClient: update to 2.4.4
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30530.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-update-30530.patch --]
[-- Type: text/x-diff, Size: 2835 bytes --]

From 424600c90782f4c194b43cdbea9ff95baf91f33f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:32:03 +0300
Subject: [PATCH] OTPClient: update to 2.4.4

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 12 +++++-------
 srcpkgs/OTPClient/template                 |  5 ++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
index ae70f441538f..e6ea2b0442b1 100644
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -1,17 +1,15 @@
-Index: OTPClient-2.4.2/CMakeLists.txt
-===================================================================
---- OTPClient-2.4.2.orig/CMakeLists.txt
-+++ OTPClient-2.4.2/CMakeLists.txt
-@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
+--- CMakeLists.txt	2021-04-27 06:27:11.708380752 +0300
++++ CMakeLists.txt	2021-04-27 06:28:14.020048767 +0300
+@@ -11,11 +11,10 @@
  option(BUILD_CLI "Build the CLI" ON)
  
  set(CMAKE_C_STANDARD 11)
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O2 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
  if(CMAKE_COMPILER_IS_GNUCC)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
  endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index f5af76e655a6..28de82117c9a 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,6 +1,6 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.2
+version=2.4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,5 +11,4 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
-patch_args=-Np1
+checksum=5b976782906f15e2a4e001d73909a05f6146010cea83d78e3ad5c850f4049da4

Re: [PR REVIEW] OTPClient: update to 2.4.4

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30530#discussion_r621157153

Comment:
Would you mind keeping this and `patch_args` in the template? Makes the patches easier to work with.

Re: [PR PATCH] [Updated] OTPClient: update to 2.4.4

[FollieHiyuki]

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

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages otpclient-update
https://github.com/void-linux/void-packages/pull/30530

OTPClient: update to 2.4.4
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30530.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-update-30530.patch --]
[-- Type: text/x-diff, Size: 2814 bytes --]

From 8f6604c9d86da53a2d609ead9449790c7725869a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:32:03 +0300
Subject: [PATCH] OTPClient: update to 2.4.4

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 10 +++++-----
 srcpkgs/OTPClient/template                 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
index ae70f441538f..5474d055d57f 100644
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -1,17 +1,17 @@
-Index: OTPClient-2.4.2/CMakeLists.txt
+Index: OTPClient-2.4.4/CMakeLists.txt
 ===================================================================
---- OTPClient-2.4.2.orig/CMakeLists.txt
-+++ OTPClient-2.4.2/CMakeLists.txt
+--- OTPClient-2.4.4.orig/CMakeLists.txt
++++ OTPClient-2.4.4/CMakeLists.txt
 @@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
  option(BUILD_CLI "Build the CLI" ON)
  
  set(CMAKE_C_STANDARD 11)
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O2 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
  if(CMAKE_COMPILER_IS_GNUCC)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
  endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index f5af76e655a6..bea17c56a1e4 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,6 +1,6 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.2
+version=2.4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,5 +11,5 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
+checksum=5b976782906f15e2a4e001d73909a05f6146010cea83d78e3ad5c850f4049da4
 patch_args=-Np1

Re: [PR REVIEW] OTPClient: update to 2.4.4

[FollieHiyuki]

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

New review comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30530#discussion_r621194558

Comment:
I reverted them back

Re: [PR REVIEW] OTPClient: update to 2.4.4

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30530#discussion_r621201655

Comment:
The thing with the prefix is that it shouldn't require being updated for every version number, since the first path is "ignored" :)

Re: [PR PATCH] [Merged]: OTPClient: update to 2.4.4

[ericonr]

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

There's a merged pull request on the void-packages repository

OTPClient: update to 2.4.4
https://github.com/void-linux/void-packages/pull/30530

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: [PR REVIEW] OTPClient: update to 2.4.4

[FollieHiyuki]

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

New review comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30530#discussion_r621202990

Comment:
Oh right I forgot it is -p1 :)