* [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0
@ 2023-03-06 14:38 realcharmer
2023-04-06 20:08 ` [PR PATCH] [Updated] " realcharmer
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: realcharmer @ 2023-03-06 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is a new pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.4, libcotp 2.0.0
I am also willing to adopt *OTPClient*.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5658 bytes --]
From cd48870b50d8f28e3a9adc21c47478a4eb77476c Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.0, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 12 ++++++------
3 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index 0f9c75af44bc..82fc508f8a1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..545606765848 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.0
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+checksum=9391244cdcbe5a871230bd9da434b415c25e3ed49fd53f482ef6c0721a12d405
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 906c81a112b1a7cc631c0af2bdcf15bc2d846d41 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.4
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 9 +++++----
2 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..e0146348ab39 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
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=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+checksum=3b2dfe6ebc3c1e30061bffdd60323f816f1963c090f7498adb6b96aa0318d753
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] Updates: OTPClient 3.1.4, libcotp 2.0.0
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
@ 2023-04-06 20:08 ` realcharmer
2023-05-05 4:32 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, " realcharmer
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-04-06 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.4, libcotp 2.0.0
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5658 bytes --]
From 675d6322fc9b93be9a2e1cb22af721d926887452 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.0, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 12 ++++++------
3 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index 45ab7fa8c512..6fa2934d8d42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3544,7 +3544,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..545606765848 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.0
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+checksum=9391244cdcbe5a871230bd9da434b415c25e3ed49fd53f482ef6c0721a12d405
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 5a6fbd3137b2985b62f04f38fd95e1fdbb027789 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.6
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 9 +++++----
2 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..3e7ce7e90afc 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.6
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
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=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+checksum=ef82c0ec51ad1f9f108a1b0e919e128d8f6e07852cec3f919ba25aace266de94
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] Updates: OTPClient 3.1.6, libcotp 2.0.0
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
2023-04-06 20:08 ` [PR PATCH] [Updated] " realcharmer
@ 2023-05-05 4:32 ` realcharmer
2023-05-30 13:51 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, libcotp 2.0.1 realcharmer
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-05-05 4:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.6, libcotp 2.0.0
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5658 bytes --]
From 838802d7a5ed428d0cbd20443c6a9aea05e8a1a8 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.1, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 12 ++++++------
3 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index 45ab7fa8c512..6fa2934d8d42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3544,7 +3544,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..ef52fd18ce3b 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 58b5fd4810719c1b6809a43d0cc85a081f95423a Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.6
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 9 +++++----
2 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..3e7ce7e90afc 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.6
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
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=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+checksum=ef82c0ec51ad1f9f108a1b0e919e128d8f6e07852cec3f919ba25aace266de94
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] Updates: OTPClient 3.1.6, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
2023-04-06 20:08 ` [PR PATCH] [Updated] " realcharmer
2023-05-05 4:32 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, " realcharmer
@ 2023-05-30 13:51 ` realcharmer
2023-05-30 13:53 ` Updates: OTPClient 3.1.7, " realcharmer
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-05-30 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.6, libcotp 2.0.1
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5658 bytes --]
From def2c3a2ebd943efe07efc72a78b3735edc979d6 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.1, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 12 ++++++------
3 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index f1e825819fb4..36adbe3594e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3556,7 +3556,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..ef52fd18ce3b 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 926872b373ee7cb016ee295abbf5d807f14573bc Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.7
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 9 +++++----
2 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..5fa8c0511ece 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.7
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
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=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+checksum=67a77ba684994ab3c75c7e137f0a7680293c3b7eb2814317535a3667bf8553d4
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Updates: OTPClient 3.1.7, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (2 preceding siblings ...)
2023-05-30 13:51 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, libcotp 2.0.1 realcharmer
@ 2023-05-30 13:53 ` realcharmer
2023-06-27 21:58 ` [PR REVIEW] " classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-05-30 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by realcharmer on void-packages repository
https://github.com/void-linux/void-packages/pull/42619#issuecomment-1568477803
Comment:
Rebased to current master, bumped `OTPclient` to version `3.1.7` and `libcotp` to `2.0.1`.
Still waiting for review and merge.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] Updates: OTPClient 3.1.7, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (3 preceding siblings ...)
2023-05-30 13:53 ` Updates: OTPClient 3.1.7, " realcharmer
@ 2023-06-27 21:58 ` classabbyamp
2023-06-28 7:34 ` [PR PATCH] [Updated] " realcharmer
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-06-27 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42619#discussion_r1244408030
Comment:
```suggestion
depends="${sourcepkg}>=${version}_${revision}"
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] Updates: OTPClient 3.1.7, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (4 preceding siblings ...)
2023-06-27 21:58 ` [PR REVIEW] " classabbyamp
@ 2023-06-28 7:34 ` realcharmer
2023-06-28 7:36 ` Updates: OTPClient 3.1.8, " realcharmer
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-06-28 7:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.7, libcotp 2.0.1
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5812 bytes --]
From dcf7629feb1d22ea7a3ced1434a1b44e31dac0ed Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.1, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 12 ++++++------
3 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index 8e97f561bae8..ef71bae3f9a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3558,7 +3558,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..29fe3108a877 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 8acee123c344a48914fc66a6a3f939d44e692fb5 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.8, adopt
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 13 +++++++------
2 files changed, 7 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..9d65d4e0794f 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.8
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Emil Miler <em@0x45.cz>"
license="GPL-3.0-or-later"
homepage="https://github.com/paolostivanin/OTPClient"
-distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+distfiles="https://github.com/paolostivanin/OTPClient/archive/refs/tags/v${version}.tar.gz"
+checksum=5b85aefa4bd10d96c7866a6b77264b416124f272b3082fb7b854e68762129c14
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Updates: OTPClient 3.1.8, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (5 preceding siblings ...)
2023-06-28 7:34 ` [PR PATCH] [Updated] " realcharmer
@ 2023-06-28 7:36 ` realcharmer
2023-06-28 7:38 ` [PR PATCH] [Updated] " realcharmer
2023-06-28 8:11 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-06-28 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by realcharmer on void-packages repository
https://github.com/void-linux/void-packages/pull/42619#issuecomment-1610918554
Comment:
Alright, I adopted `OTPClient` as well and updated it to latest upstream version `3.1.8`.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] Updates: OTPClient 3.1.8, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (6 preceding siblings ...)
2023-06-28 7:36 ` Updates: OTPClient 3.1.8, " realcharmer
@ 2023-06-28 7:38 ` realcharmer
2023-06-28 8:11 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: realcharmer @ 2023-06-28 7:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
There is an updated pull request by realcharmer against master on the void-packages repository
https://github.com/realcharmer/void-packages otpclient
https://github.com/void-linux/void-packages/pull/42619
Updates: OTPClient 3.1.8, libcotp 2.0.1
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
A patch file from https://github.com/void-linux/void-packages/pull/42619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-otpclient-42619.patch --]
[-- Type: text/x-diff, Size: 5905 bytes --]
From c20d2baf7da66bd2aaf015d0a8a2c51b5a3c410c Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1/2] libcotp: update to 2.0.1, adopt
---
common/shlibs | 2 +-
srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
srcpkgs/libcotp/template | 14 +++++++-------
3 files changed, 8 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index 8e97f561bae8..ef71bae3f9a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3558,7 +3558,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots-0.16.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
-
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
-
- add_library(cotp SHARED ${SOURCE_FILES})
-
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..2e1596e89fc4 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
# Template file for 'libcotp'
pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
license="Apache-2.0"
homepage="https://github.com/paolostivanin/libcotp"
-distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+distfiles="https://github.com/paolostivanin/libcotp/archive/refs/tags/v${version}.tar.gz"
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
libcotp-devel_package() {
- depends="libcotp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From c1236faf8bedf079072f879658102456643d39b2 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 2/2] OTPClient: update to 3.1.8, adopt
---
srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
srcpkgs/OTPClient/template | 13 +++++++------
2 files changed, 7 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch
diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/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 -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=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 a5f068ffa976..9d65d4e0794f 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.8
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Emil Miler <em@0x45.cz>"
license="GPL-3.0-or-later"
homepage="https://github.com/paolostivanin/OTPClient"
-distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+distfiles="https://github.com/paolostivanin/OTPClient/archive/refs/tags/v${version}.tar.gz"
+checksum=5b85aefa4bd10d96c7866a6b77264b416124f272b3082fb7b854e68762129c14
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: Updates: OTPClient 3.1.8, libcotp 2.0.1
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
` (7 preceding siblings ...)
2023-06-28 7:38 ` [PR PATCH] [Updated] " realcharmer
@ 2023-06-28 8:11 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-06-28 8:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
There's a merged pull request on the void-packages repository
Updates: OTPClient 3.1.8, libcotp 2.0.1
https://github.com/void-linux/void-packages/pull/42619
Description:
The new library version is needed for *OTPClient*, since it replaces `libbaseencode` in new releases.
I am also willing to adopt *OTPClient*, but it has a listed maintainer.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- i686
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-06-28 8:11 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-06 14:38 [PR PATCH] Updates: OTPClient 3.1.4, libcotp 2.0.0 realcharmer
2023-04-06 20:08 ` [PR PATCH] [Updated] " realcharmer
2023-05-05 4:32 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, " realcharmer
2023-05-30 13:51 ` [PR PATCH] [Updated] Updates: OTPClient 3.1.6, libcotp 2.0.1 realcharmer
2023-05-30 13:53 ` Updates: OTPClient 3.1.7, " realcharmer
2023-06-27 21:58 ` [PR REVIEW] " classabbyamp
2023-06-28 7:34 ` [PR PATCH] [Updated] " realcharmer
2023-06-28 7:36 ` Updates: OTPClient 3.1.8, " realcharmer
2023-06-28 7:38 ` [PR PATCH] [Updated] " realcharmer
2023-06-28 8:11 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).