From cd48870b50d8f28e3a9adc21c47478a4eb77476c Mon Sep 17 00:00:00 2001 From: Emil Miler 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 " +maintainer="Emil Miler " 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 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 " 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