pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/libfprint Upgrade security/libfprint from 0.0...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2eb225840f52
branches:  trunk
changeset: 369835:2eb225840f52
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Fri Oct 06 14:16:00 2017 +0000

description:
Upgrade security/libfprint from 0.0.6 to 0.7.0

Changes are too numerous to list.
Install cli test tools.

diffstat:

 security/libfprint/Makefile                        |  39 ++++++++++++---------
 security/libfprint/PLIST                           |   9 ++--
 security/libfprint/buildlink3.mk                   |   6 +-
 security/libfprint/distinfo                        |  13 +++---
 security/libfprint/patches/patch-aa                |  32 ------------------
 security/libfprint/patches/patch-ab                |  13 -------
 security/libfprint/patches/patch-examples_Makefile |  15 ++++++++
 7 files changed, 52 insertions(+), 75 deletions(-)

diffs (181 lines):

diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/Makefile
--- a/security/libfprint/Makefile       Fri Oct 06 08:53:32 2017 +0000
+++ b/security/libfprint/Makefile       Fri Oct 06 14:16:00 2017 +0000
@@ -1,29 +1,36 @@
-# $NetBSD: Makefile,v 1.37 2017/10/05 12:51:59 hauke Exp $
+# $NetBSD: Makefile,v 1.38 2017/10/06 14:16:00 hauke Exp $
 
-DISTNAME=      libfprint-0.0.6
-PKGREVISION=   32
+DISTNAME=      libfprint-0.7.0
+#PKGREVISION=  1
 CATEGORIES=    security devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fprint/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  https://people.freedesktop.org/~anarsoul/
+EXTRACT_SUFX=  .tar.xz
 
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.freedesktop.org/wiki/Software/fprint/
 COMMENT=       Fingerprint reader access library
 LICENSE=       gnu-lgpl-v2.1
 
-USE_LIBTOOL=   yes
-GNU_CONFIGURE= yes
-USE_TOOLS+=    pkg-config autoconf automake autoheader autoreconf
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            pkg-config gmake
+USE_LANGUAGES=         c
 
-CPPFLAGS+=     -DHAVE_MEMMEM
+#CONFIGURE_ARGS+=      --enable-debug-log
+CONFIGURE_ARGS+=       --enable-examples-build
+
+INSTALLATION_DIRS+=    lib bin
 
-CONFIGURE_ARGS+=CRYPTO_CFLAGS=-I${SSLBASE}/include/openssl \
-               CRYPTO_LIBS="-L${SSLBASE}/lib -lcrypto"
+post-install:
+       for pp in enroll img_capture verify verify_live; do \
+               ${INSTALL_PROGRAM} ${WRKSRC}/examples/$${pp} \
+                       ${DESTDIR}${PREFIX}/bin/ ; \
+       done
 
-pre-configure:
-       cd ${WRKSRC} && autoreconf -vif
-
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../graphics/ImageMagick6/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
-.include "../../graphics/ImageMagick6/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/PLIST
--- a/security/libfprint/PLIST  Fri Oct 06 08:53:32 2017 +0000
+++ b/security/libfprint/PLIST  Fri Oct 06 14:16:00 2017 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/10/06 14:16:00 hauke Exp $
+bin/enroll
+bin/img_capture
+bin/verify
+bin/verify_live
 include/libfprint/fprint.h
-lib/libfprint.a
 lib/libfprint.la
-lib/libfprint.so
-lib/libfprint.so.0
 lib/pkgconfig/libfprint.pc
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/buildlink3.mk
--- a/security/libfprint/buildlink3.mk  Fri Oct 06 08:53:32 2017 +0000
+++ b/security/libfprint/buildlink3.mk  Fri Oct 06 14:16:00 2017 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/10/06 14:16:00 hauke Exp $
 
 BUILDLINK_TREE+=       libfprint
 
 .if !defined(LIBFPRINT_BUILDLINK3_MK)
 LIBFPRINT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libfprint+=      libfprint>=0.0.6
-BUILDLINK_ABI_DEPENDS.libfprint+=      libfprint>=0.0.6
+BUILDLINK_API_DEPENDS.libfprint+=      libfprint>=0.7.0
+BUILDLINK_ABI_DEPENDS.libfprint+=      libfprint>=0.7.0
 BUILDLINK_PKGSRCDIR.libfprint?=                ../../security/libfprint
 .endif # LIBFPRINT_BUILDLINK3_MK
 
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/distinfo
--- a/security/libfprint/distinfo       Fri Oct 06 08:53:32 2017 +0000
+++ b/security/libfprint/distinfo       Fri Oct 06 14:16:00 2017 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:17:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/10/06 14:16:00 hauke Exp $
 
-SHA1 (libfprint-0.0.6.tar.bz2) = 430af91efbefeb2b98fe30215fb33051e4f8efc5
-RMD160 (libfprint-0.0.6.tar.bz2) = 3677a0997da641ba3e8586222ca88640e1f6373f
-SHA512 (libfprint-0.0.6.tar.bz2) = f7d5781b2911d45e80631f3d82dd1dd5a3a96ffa257569c01332b821265db59d123471979b79e09318560249e19ff2f2f5d3e3c3161449d7609d39dbdc0693ad
-Size (libfprint-0.0.6.tar.bz2) = 431957 bytes
-SHA1 (patch-aa) = 19797404ed4937941c008fd129e5efb643b9f5e2
-SHA1 (patch-ab) = 0bde246ce6e1d223637ba0decce6fa5db9e88eb1
+SHA1 (libfprint-0.7.0.tar.xz) = 378c3c3797fe2c7d945f79296ff76e8bc956aa90
+RMD160 (libfprint-0.7.0.tar.xz) = 5cafb1f7ab8b1259ed75276b4ef74f4a399ba825
+SHA512 (libfprint-0.7.0.tar.xz) = 7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16
+Size (libfprint-0.7.0.tar.xz) = 550484 bytes
+SHA1 (patch-examples_Makefile) = 9f18e40b0f3037fe047c40f4a556a5c5cd88a387
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/patches/patch-aa
--- a/security/libfprint/patches/patch-aa       Fri Oct 06 08:53:32 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2013/01/23 17:27:48 wiz Exp $
-
-First chunk: automake-1.13 compat.
-
---- configure.ac.orig  2008-03-20 13:55:45.000000000 +0000
-+++ configure.ac
-@@ -1,7 +1,7 @@
- AC_INIT([libfprint], [0.0.6])
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([libfprint/core.c])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_PREREQ([2.50])
- AC_PROG_CC
-@@ -89,9 +89,15 @@ if test "x$debug_log_enabled" != "xno"; 
-       AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging])
- fi
- 
-+# Restore gnu89 inline semantics on gcc 4.3 and newer
-+saved_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline"
-+AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), inline_cflags="-fgnu89-inline", inline_cflags="")
-+CFLAGS="$saved_cflags"
-+
- 
- AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
--AM_CFLAGS="-std=gnu99 -fgnu89-inline -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
-+AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
- AC_SUBST(AM_CFLAGS)
- 
- AC_CONFIG_FILES([libfprint.pc] [Makefile] [libfprint/Makefile] [examples/Makefile] [doc/Makefile])
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/patches/patch-ab
--- a/security/libfprint/patches/patch-ab       Fri Oct 06 08:53:32 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/05/10 18:25:34 hasso Exp $
-
---- libfprint/imgdev.c.orig    2009-05-10 19:55:15 +0300
-+++ libfprint/imgdev.c 2009-05-10 19:55:34 +0300
-@@ -175,7 +175,7 @@ int fpi_imgdev_capture(struct fp_img_dev
- 
-       if (img == NULL) {
-               fp_err("capture succeeded but no image returned?");
--              return -ENODATA;
-+              return -EIO;
-       }
- 
-       if (!unconditional && imgdrv->await_finger_off) {
diff -r 9fa6a07c83bc -r 2eb225840f52 security/libfprint/patches/patch-examples_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libfprint/patches/patch-examples_Makefile        Fri Oct 06 14:16:00 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_Makefile,v 1.1 2017/10/06 14:16:00 hauke Exp $
+
+Do not build C++ test binary.
+
+--- examples/Makefile.in.orig  2017-05-14 16:27:17.000000000 +0000
++++ examples/Makefile.in
+@@ -89,7 +89,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ noinst_PROGRAMS = verify_live$(EXEEXT) enroll$(EXEEXT) verify$(EXEEXT) \
+-      img_capture$(EXEEXT) cpp-test$(EXEEXT) $(am__EXEEXT_1)
++      img_capture$(EXEEXT) $(am__EXEEXT_1)
+ @BUILD_X11_EXAMPLES_TRUE@am__append_1 = img_capture_continuous
+ subdir = examples
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4



Home | Main Index | Thread Index | Old Index