From 96d76f2937557a78cceba488d8b0be69f1e8b304 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:29:21 +0700 Subject: [PATCH 1/7] libfprint: rename to libfprint0 --- common/shlibs | 2 +- srcpkgs/libfprint-devel | 1 - srcpkgs/libfprint0-devel | 1 + .../patches/fix-stderr-redefinition.patch | 0 srcpkgs/{libfprint => libfprint0}/template | 9 +++++---- srcpkgs/{libfprint => libfprint0}/update | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) delete mode 120000 srcpkgs/libfprint-devel create mode 120000 srcpkgs/libfprint0-devel rename srcpkgs/{libfprint => libfprint0}/patches/fix-stderr-redefinition.patch (100%) rename srcpkgs/{libfprint => libfprint0}/template (85%) rename srcpkgs/{libfprint => libfprint0}/update (70%) diff --git a/common/shlibs b/common/shlibs index 5e6a8d0c6ec..9ef3d90c992 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.so.0 libfprint0-1.0_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-devel b/srcpkgs/libfprint-devel deleted file mode 120000 index 739ca683efa..00000000000 --- a/srcpkgs/libfprint-devel +++ /dev/null @@ -1 +0,0 @@ -libfprint \ No newline at end of file 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/libfprint/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch similarity index 100% rename from srcpkgs/libfprint/patches/fix-stderr-redefinition.patch rename to srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint0/template similarity index 85% rename from srcpkgs/libfprint/template rename to srcpkgs/libfprint0/template index ae22b871f3d..6c936180410 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint0/template @@ -1,5 +1,5 @@ -# Template file for 'libfprint' -pkgname=libfprint +# Template file for 'libfprint0' +pkgname=libfprint0 version=1.0 revision=1 wrksrc="libfprint-V_${version//./_}" @@ -14,13 +14,14 @@ 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}_${revision}" post_install() { vmkdir usr/lib/udev/rules.d - vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d } -libfprint-devel_package() { +libfprint0-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/libfprint/update b/srcpkgs/libfprint0/update similarity index 70% rename from srcpkgs/libfprint/update rename to srcpkgs/libfprint0/update index 1f57940e938..bebe6bef5f3 100644 --- a/srcpkgs/libfprint/update +++ b/srcpkgs/libfprint0/update @@ -1,2 +1,2 @@ pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")' -ignore='*.99.*' +ignore='*.99.* 1.9* [2-9].*' From 38288010d8d40d76a29af835d65d08e0c5229423 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 2/7] 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 b4e60bf03c00eeef698d8ad4518d5e17b3b5d2d7 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 3/7] 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 e0e103a0e577af2a4e30eba50e4d8e5c5f5b685f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Sep 2020 08:33:08 +0700 Subject: [PATCH 4/7] New package: libfprint-1.90.7 --- common/shlibs | 1 + srcpkgs/libfprint-devel | 1 + srcpkgs/libfprint-udev-rules | 1 + .../patches/fix-stderr-redefinition.patch | 12 ++++++ srcpkgs/libfprint/template | 38 +++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 120000 srcpkgs/libfprint-devel create mode 120000 srcpkgs/libfprint-udev-rules create mode 100644 srcpkgs/libfprint/patches/fix-stderr-redefinition.patch create mode 100644 srcpkgs/libfprint/template diff --git a/common/shlibs b/common/shlibs index 9ef3d90c992..ad3d9d1db89 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1572,6 +1572,7 @@ 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 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 diff --git a/srcpkgs/libfprint-devel b/srcpkgs/libfprint-devel new file mode 120000 index 00000000000..739ca683efa --- /dev/null +++ b/srcpkgs/libfprint-devel @@ -0,0 +1 @@ +libfprint \ No newline at end of file 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/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch new file mode 100644 index 00000000000..3784ccba869 --- /dev/null +++ b/srcpkgs/libfprint/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/libfprint/template b/srcpkgs/libfprint/template new file mode 100644 index 00000000000..9f32d0bea08 --- /dev/null +++ b/srcpkgs/libfprint/template @@ -0,0 +1,38 @@ +# Template file for 'libfprint' +pkgname=libfprint +version=1.90.7 +revision=1 +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 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=d11acf183820812fd6a8cd808d58bbf197554bcc0f9119d4c873092ecd94ee29 + +libfprint-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + 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 + } +} From 9e742ef401522dfd0ce76c7ced0ec7f7adeb8538 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:41:14 +0700 Subject: [PATCH 5/7] libfprint0: depends on same udev rules as libfprint revision must be >=2 to not conflicts with the udev-rules. --- srcpkgs/libfprint0/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfprint0/template b/srcpkgs/libfprint0/template index 6c936180410..2d31deb97f4 100644 --- a/srcpkgs/libfprint0/template +++ b/srcpkgs/libfprint0/template @@ -1,12 +1,13 @@ # Template file for 'libfprint0' pkgname=libfprint0 version=1.0 -revision=1 +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" @@ -15,7 +16,7 @@ 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}_${revision}" +replaces="libfprint<=${version}_1" post_install() { vmkdir usr/lib/udev/rules.d From d31d7fdbae82e1babecd8c8eddf1b56c4421cd86 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 6/7] 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 881cbc3e022dd2ee28bde9a57117257e446fed3b 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 7/7] 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/ -}