From e2065dbdd8f7b3d1fbbfc86886cd59d413a3e785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 14 Jan 2021 07:40:30 +0700 Subject: [PATCH 1/6] libfprint: update to 1.90.7. --- common/shlibs | 2 +- srcpkgs/libfprint-udev-rules | 1 + srcpkgs/libfprint/template | 29 ++++++++++++++++++----------- srcpkgs/libfprint/update | 2 -- 4 files changed, 20 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/libfprint-udev-rules delete mode 100644 srcpkgs/libfprint/update diff --git a/common/shlibs b/common/shlibs index 5e6a8d0c6ec..bcd03174b47 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1571,7 +1571,7 @@ libtcmalloc.so.4 gperftools-2.1_1 libaio.so.1 libaio-0.3.109_1 libofx.so.7 libofx-0.9.11_1 libsigsegv.so.2 libsigsegv-2.10_2 -libfprint.so.0 libfprint-0.5.1_1 +libfprint-2.so.2 libfprint-1.90.7_1 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 diff --git a/srcpkgs/libfprint-udev-rules b/srcpkgs/libfprint-udev-rules new file mode 120000 index 00000000000..739ca683efa --- /dev/null +++ b/srcpkgs/libfprint-udev-rules @@ -0,0 +1 @@ +libfprint \ No newline at end of file diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index ae22b871f3d..9f32d0bea08 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -1,24 +1,22 @@ # Template file for 'libfprint' pkgname=libfprint -version=1.0 +version=1.90.7 revision=1 -wrksrc="libfprint-V_${version//./_}" +wrksrc=libfprint-v$version build_style=meson +build_helper=gir configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false" -hostmakedepends="pkg-config" -makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel" +hostmakedepends="pkg-config glib-devel" +makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel + libgusb-devel libglib-devel" +depends="libfprint-udev-rules>=${version}_${revision}" short_desc="Support for consumer fingerprint reader devices" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/" changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" -distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${version//./_}/libfprint-V_${version//./_}.tar.bz2" -checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9 - -post_install() { - vmkdir usr/lib/udev/rules.d - vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d -} +distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2" +checksum=d11acf183820812fd6a8cd808d58bbf197554bcc0f9119d4c873092ecd94ee29 libfprint-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -29,3 +27,12 @@ libfprint-devel_package() { vmove "usr/lib/*.so" } } + +libfprint-udev-rules_package() { + short_desc+=" - udev rules" + conflicts="libfprint<=1.0_1" + pkg_install() { + vmkdir usr/lib/udev/rules.d + vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d + } +} diff --git a/srcpkgs/libfprint/update b/srcpkgs/libfprint/update deleted file mode 100644 index 1f57940e938..00000000000 --- a/srcpkgs/libfprint/update +++ /dev/null @@ -1,2 +0,0 @@ -pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")' -ignore='*.99.*' From cb42220d9500bd920023a189f274e62b3e6fa670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 14 Jan 2021 07:41:57 +0700 Subject: [PATCH 2/6] New package: libfprint0-1.0 --- common/shlibs | 1 + srcpkgs/libfprint0-devel | 1 + .../patches/fix-stderr-redefinition.patch | 12 +++++++ srcpkgs/libfprint0/template | 33 +++++++++++++++++++ srcpkgs/libfprint0/update | 2 ++ 5 files changed, 49 insertions(+) create mode 120000 srcpkgs/libfprint0-devel create mode 100644 srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch create mode 100644 srcpkgs/libfprint0/template create mode 100644 srcpkgs/libfprint0/update diff --git a/common/shlibs b/common/shlibs index bcd03174b47..ad3d9d1db89 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1571,6 +1571,7 @@ libtcmalloc.so.4 gperftools-2.1_1 libaio.so.1 libaio-0.3.109_1 libofx.so.7 libofx-0.9.11_1 libsigsegv.so.2 libsigsegv-2.10_2 +libfprint.so.0 libfprint0-1.0_1 libfprint-2.so.2 libfprint-1.90.7_1 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 diff --git a/srcpkgs/libfprint0-devel b/srcpkgs/libfprint0-devel new file mode 120000 index 00000000000..f5b92a78c25 --- /dev/null +++ b/srcpkgs/libfprint0-devel @@ -0,0 +1 @@ +libfprint0 \ No newline at end of file diff --git a/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch new file mode 100644 index 00000000000..3784ccba869 --- /dev/null +++ b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch @@ -0,0 +1,12 @@ +--- libfprint/nbis/include/bozorth.h.orig 2019-08-11 15:17:26.878344708 +0200 ++++ libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 +@@ -218,7 +218,9 @@ struct xytq_struct { + /* Globals supporting command line options */ + extern int verbose_threshold; + /* Global supporting error reporting */ ++#ifdef __GLIBC__ + extern FILE *stderr; ++#endif + + /**************************************************************************/ + /* In: BZ_GBLS.C */ diff --git a/srcpkgs/libfprint0/template b/srcpkgs/libfprint0/template new file mode 100644 index 00000000000..2d31deb97f4 --- /dev/null +++ b/srcpkgs/libfprint0/template @@ -0,0 +1,33 @@ +# Template file for 'libfprint0' +pkgname=libfprint0 +version=1.0 +revision=2 +wrksrc="libfprint-V_${version//./_}" +build_style=meson +configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false" +hostmakedepends="pkg-config" +makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel" +depends="libfprint-udev-rules" +short_desc="Support for consumer fingerprint reader devices" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="http://www.freedesktop.org/wiki/Software/fprint/" +changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${version//./_}/libfprint-V_${version//./_}.tar.bz2" +checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9 +provides="libfprint-${version}_${revision}" +replaces="libfprint<=${version}_1" + +post_install() { + vmkdir usr/lib/udev/rules.d +} + +libfprint0-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libfprint0/update b/srcpkgs/libfprint0/update new file mode 100644 index 00000000000..bebe6bef5f3 --- /dev/null +++ b/srcpkgs/libfprint0/update @@ -0,0 +1,2 @@ +pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")' +ignore='*.99.* 1.9* [2-9].*' From ede732149e55d6e397c0fb898adc385b287de4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 13 Jan 2021 22:33:19 +0700 Subject: [PATCH 3/6] fprint_demo: rebuild with libfprint0 --- srcpkgs/fprint_demo/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fprint_demo/template b/srcpkgs/fprint_demo/template index a801b480bbf..723fa68f3f7 100644 --- a/srcpkgs/fprint_demo/template +++ b/srcpkgs/fprint_demo/template @@ -1,15 +1,15 @@ # Template file for 'fprint_demo' pkgname=fprint_demo version=0.4 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" -makedepends="gtk+-devel libfprint-devel" +makedepends="gtk+-devel libfprint0-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Demonstrates libfprint's capabilities" maintainer="Enno Boland " +license="GPL-2.0-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/" -license="GPL-2" distfiles="https://github.com/dsd/${pkgname}/archive/v${version}.tar.gz" checksum=6f54f43e0a015cd83504a2c726a59154c5aee83e229e8494d54e592624ee3ad5 From 2eb4a73ee094f3e2ab863f283dc54f8f3e01f27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 13 Jan 2021 22:33:41 +0700 Subject: [PATCH 4/6] fingerprint-gui: rebuild with fprint0 --- srcpkgs/fingerprint-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template index f030ab573aa..a17832fe13f 100644 --- a/srcpkgs/fingerprint-gui/template +++ b/srcpkgs/fingerprint-gui/template @@ -1,11 +1,11 @@ # Template file for 'fingerprint-gui' pkgname=fingerprint-gui version=1.09 -revision=2 +revision=3 wrksrc="${pkgname}-${version}-qt5" build_style=qmake hostmakedepends="qt5-host-tools qt5-qmake" -makedepends="qt5-devel qca-qt5-devel libfprint-devel libfakekey-devel +makedepends="qt5-devel qca-qt5-devel libfprint0-devel libfakekey-devel polkit-qt5-devel pam-devel qt5-x11extras-devel" depends="desktop-file-utils" short_desc="Fingerprint management GUI and PAM module" From 6669bc8866b42350a7fc0da3771f3cda32e66ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 10 Sep 2020 22:56:15 +0700 Subject: [PATCH 5/6] New package: pam_wrapper-1.1.3 --- common/shlibs | 1 + srcpkgs/pam_wrapper/template | 24 ++++++++++++++++++++++++ srcpkgs/python3-pypamtest | 1 + 3 files changed, 26 insertions(+) create mode 100644 srcpkgs/pam_wrapper/template create mode 120000 srcpkgs/python3-pypamtest diff --git a/common/shlibs b/common/shlibs index ad3d9d1db89..1640df6dc0c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4045,3 +4045,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1 libutil-cmdline-samba4.so samba-libs-4.13.2_1 libwinbind-client-samba4.so samba-libs-4.13.2_1 libsixel.so.1 libsixel-1.8.6_1 +libpamtest.so.0 pam_wrapper-1.1.3_1 diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template new file mode 100644 index 00000000000..ff5d9df688e --- /dev/null +++ b/srcpkgs/pam_wrapper/template @@ -0,0 +1,24 @@ +# Template file for 'pam_wrapper' +pkgname=pam_wrapper +version=1.1.3 +revision=1 +build_style=cmake +configure_args="-DCMAKE_BUILD_TYPE=None -DUNIT_TESTING=ON" +hostmakedepends="cmake python3" +makedepends="python3-devel pam-devel cmocka-devel" +short_desc="Tool to test PAM applications and modules" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://cwrap.org/pam_wrapper.html" +distfiles="https://www.samba.org/ftp/cwrap/pam_wrapper-${version}.tar.gz" +checksum=4feedd788c6fa36516f6d6060482cd86455998d72849eb5f539de48915bdc5f3 +lib32disabled=yes + +python3-pypamtest_package() { + lib32disabled=yes + short_desc+=" - Python 3 bindings" + depends="${sourcepkg}>=${version}_${revision} python3" + pkg_install() { + vmove usr/lib/python* + } +} diff --git a/srcpkgs/python3-pypamtest b/srcpkgs/python3-pypamtest new file mode 120000 index 00000000000..3ea00f9d1ad --- /dev/null +++ b/srcpkgs/python3-pypamtest @@ -0,0 +1 @@ +pam_wrapper \ No newline at end of file From a7a6d4b9c524bec3c02175cec144311ccddb49e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 10 Sep 2020 20:54:57 +0700 Subject: [PATCH 6/6] fprintd: update to 1.90.1. --- srcpkgs/fprintd/template | 41 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template index 11e0922ea43..8e40d243de2 100644 --- a/srcpkgs/fprintd/template +++ b/srcpkgs/fprintd/template @@ -1,36 +1,21 @@ # Template file for 'fprintd' pkgname=fprintd -version=0.9.0 -revision=3 -wrksrc="fprintd-V_${version//./_}" -build_style=gnu-configure -configure_args="--sysconfdir=/etc/${pkgname} --disable-static --without-systemdsystemunitdir" +version=1.90.9 +revision=1 +wrksrc=fprintd-v$version +build_style=meson +configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false + -Dsystemd=false -Dpam_modules_dir=/usr/lib/security" conf_files="/etc/fprintd/fprintd.conf" -hostmakedepends="autoconf automake dbus-glib-devel gettext-devel glib-devel gtk-doc intltool libtool m4 pkg-config" -makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel libfprint-devel pam-devel polkit-devel" +hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool + pkg-config perl python3-cairo python3-pypamtest python3-dbus + python3-dbusmock libxslt libfprint polkit" +makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel pam-devel + libfprint-devel polkit-devel cairo-devel elogind-devel pam_wrapper" short_desc="Daemon that provides fingerprint scanning functionality" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/fprint/" -distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/V_${version//./_}/fprintd-V_${version//./_}.tar.bz2" -checksum=3bfbf870a3c333a0a1f08287b2b8501c34fd347faac8c1d52bd0d64ab3474d8e +distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v$version/fprintd-v$version.tar.bz2" +checksum=9c9dcef205be0dfc669e2c892b28224dcd517674214aba745697e7341e3aef6f lib32disabled=yes - -CFLAGS="-fcommon" - -pre_configure() { - glib-gettextize -c -f - gtkdocize --copy - intltoolize -c -f - libtoolize -c - aclocal - autoconf - autoheader - automake -a -c -} - -post_install() { - mv $DESTDIR/etc/$pkgname/dbus-1 $DESTDIR/usr/share/dbus-1 - vmkdir usr/share/dbus-1/system.d - mv $DESTDIR/usr/share/dbus-1/dbus-1/system.d/net.reactivated.Fprint.conf $DESTDIR/usr/share/dbus-1/system.d/ -}