cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libfprint-0.6.0.

Browse Source
This commit is contained in:
ajacoutot 2018-04-26 16:01:45 +00:00
parent 053bb3039f
commit 551a3230c6
5 changed files with 18 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
security/libfprint/Makefile
View File

@ -1,35 +1,32 @@
# $OpenBSD: Makefile,v 1.28 2017/11/21 00:13:03 naddy Exp $
# $OpenBSD: Makefile,v 1.29 2018/04/26 16:01:45 ajacoutot Exp $
COMMENT= library for fingerprint reader devices
COMMENT= library for fingerprint reader devices
DISTNAME= libfprint-0.4.0
REVISION= 12
DISTNAME= libfprint-0.6.0
CATEGORIES= security
CATEGORIES= security
SHARED_LIBS += fprint 1.0 # 0.0
SHARED_LIBS += fprint 1.1 # 0.0
HOMEPAGE= http://www.freedesktop.org/wiki/Software/fprint/libfprint
MASTER_SITES= http://people.freedesktop.org/~hadess/
EXTRACT_SUFX= .tar.bz2
HOMEPAGE=a http://www.freedesktop.org/wiki/Software/fprint/libfprint
MASTER_SITES= http://people.freedesktop.org/~hadess/
EXTRACT_SUFX= .tar.xz
MAINTAINER= Robert Nagy <robert@openbsd.org>
MAINTAINER= Robert Nagy <robert@openbsd.org>
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = ICE MagickCore-6.Q16 SM X11 Xext Xt bz2 djvulibre expat fftw3
WANTLIB += fontconfig freetype glib-2.0 iconv intl jbig jpeg lcms2 lzma
WANTLIB += m nspr4 nss3 nssutil3 openjp2 pcre plc4 plds4 png pthread
WANTLIB += smime3 sqlite3 ssl3 tiff usb-1.0 webp xcb xml2 z
WANTLIB += glib-2.0 iconv intl m nspr4 nss3 nssutil3 pcre pixman-1
WANTLIB += plc4 plds4 pthread smime3 ssl3 usb-1.0
LIB_DEPENDS= databases/sqlite3 \
graphics/ImageMagick \
devel/glib2 \
CONFIGURE_STYLE= gnu
LIB_DEPENDS= devel/glib2 \
devel/libusb1 \
security/nss
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
post-install:
rm -r ${WRKINST}/rules.d
.include <bsd.port.mk>

4
security/libfprint/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libfprint-0.4.0.tar.bz2) = MY1cORDjenGhsrJ/5nZybsFMr6/i+G7L47FBLL4qITI=
SIZE (libfprint-0.4.0.tar.bz2) = 476262
SHA256 (libfprint-0.6.0.tar.xz) = JYP8t9VCqRjAI3dvGIBn/O3sYU5lSU3VK8TWYb6APL4=
SIZE (libfprint-0.6.0.tar.xz) = 531572

47
security/libfprint/patches/patch-configure_ac
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2012/02/22 09:30:20 dcoppa Exp $
--- configure.ac.orig Fri Nov 18 19:17:48 2011
+++ configure.ac Fri Nov 18 19:20:02 2011
@@ -127,22 +127,17 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
imagemagick_found=no
-gdkpixbuf_found=no
if test "$require_imaging" = "yes"; then
- PKG_CHECK_MODULES(IMAGING, gthread-2.0 gdk-pixbuf-2.0, [gdkpixbuf_found=yes], [gdkpixbuf_found=no])
- if test "$gdkpixbuf_found" != "yes"; then
- PKG_CHECK_MODULES(IMAGING, ImageMagick, [imagemagick_found=yes], [imagemagick_found=no])
- fi
+ PKG_CHECK_MODULES(IMAGING, ImageMagick, [imagemagick_found=yes], [imagemagick_found=no])
fi
if test "$require_imaging" = "yes"; then
- if test "$gdkpixbuf_found" != "yes" && test "$imagemagick_found" != "yes"; then
- AC_MSG_ERROR([gdk-pixbuf or ImageMagick is required for imaging support])
+ if test "$imagemagick_found" != "yes"; then
+ AC_MSG_ERROR([ImageMagick is required for imaging support])
fi
fi
-AM_CONDITIONAL([REQUIRE_GDKPIXBUF], [test "$gdkpixbuf_found" = "yes"])
AM_CONDITIONAL([REQUIRE_IMAGEMAGICK], [test "$imagemagick_found" = "yes"])
AC_SUBST(IMAGING_CFLAGS)
AC_SUBST(IMAGING_LIBS)
@@ -209,15 +204,11 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), inline_cflags="
CFLAGS="$saved_cflags"
AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
+AM_CFLAGS="-std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration"
AC_SUBST(AM_CFLAGS)
if test "$require_imaging" = "yes"; then
- if test x$gdkpixbuf_found != no; then
- AC_MSG_NOTICE([** Using gdk-pixbuf for imaging])
- else
- AC_MSG_NOTICE([** Using ImageMagick for imaging])
- fi
+ AC_MSG_NOTICE([** Using ImageMagick for imaging])
else
AC_MSG_NOTICE([ Imaging support disabled])
fi

21
security/libfprint/patches/patch-libfprint_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-libfprint_Makefile_in,v 1.2 2012/02/22 09:30:20 dcoppa Exp $
--- libfprint/Makefile.in.orig Mon Apr 18 19:02:51 2011
+++ libfprint/Makefile.in Fri Nov 18 22:08:44 2011
@@ -425,7 +425,7 @@ NBIS_SRC = \
nbis/mindtct/sort.c \
nbis/mindtct/util.c
-libfprint_la_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include \
+libfprint_la_CFLAGS = -I$(srcdir)/nbis/include \
$(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS) \
$(am__append_11) $(am__append_14)
libfprint_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
@@ -1195,7 +1195,7 @@ info: info-am
info-am:
-install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA
+install-data-am: install-pkgincludeHEADERS
install-dvi: install-dvi-am

20
security/libfprint/patches/patch-libfprint_imgdev_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-libfprint_imgdev_c,v 1.1 2012/06/13 09:52:23 dcoppa Exp $
From 3d2e54526454ed1436b6436dffb0e8769fdbff1d Mon Sep 17 00:00:00 2001
From: Patrick Marlier <patrick.marlier@gmail.com>
Date: Wed, 18 Jan 2012 23:52:02 +0000
Subject: Fix possible crash without a deactivate callback
We were checking for ->activate existing instead of ->deactivate.
--- libfprint/imgdev.c.orig Thu Aug 19 21:21:32 2010
+++ libfprint/imgdev.c Wed Jun 13 11:31:46 2012
@@ -370,7 +370,7 @@ static void dev_deactivate(struct fp_img_dev *imgdev)
struct fp_driver *drv = imgdev->dev->drv;
struct fp_img_driver *imgdrv = fpi_driver_to_img_driver(drv);
- if (!imgdrv->activate)
+ if (!imgdrv->deactivate)
return;
return imgdrv->deactivate(imgdev);
}