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

Update to libfprint-0.4.0

Browse Source 
OK robert@ (maintainer)
This commit is contained in:
dcoppa 2012-02-22 09:30:19 +00:00
parent 6cdd6746a6
commit 1b6e355dec
6 changed files with 93 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
security/libfprint/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.11 2011/11/13 13:54:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2012/02/22 09:30:19 dcoppa Exp $
COMMENT= library for fingerprint reader devices
DISTNAME= libfprint-0.0.6
REVISION = 6
DISTNAME= libfprint-0.4.0
CATEGORIES= security
SHARED_LIBS += fprint 0.0 # 0.0
SHARED_LIBS += fprint 1.0 # 0.0
HOMEPAGE= http://reactivated.net/fprint/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fprint/}
HOMEPAGE= http://www.freedesktop.org/wiki/Software/fprint/libfprint
MASTER_SITES= http://people.freedesktop.org/~hadess/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -20,20 +19,21 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += MagickCore bz2 crypto djvulibre fftw3 glib-2.0 jasper
WANTLIB += jbig jpeg lcms2 ltdl lzma m pcre png tiff usb usb-1.0
WANTLIB += z
WANTLIB += MagickCore bz2 djvulibre fftw3 glib-2.0
WANTLIB += jasper jbig jpeg lcms2 ltdl lzma m nspr4
WANTLIB += nss3 nssutil3 pcre plc4 plds4 png smime3
WANTLIB += softokn3 sqlite3 ssl3 tiff usb-1.0 z
MODULES= devel/gettext
LIB_DEPENDS= graphics/ImageMagick \
devel/glib2 \
devel/libusb-compat
devel/libusb1>=1.0.8p3 \
security/nss
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CRYPTO_CFLAGS="-I/usr/include" \
CRYPTO_LIBS="-lcrypto"
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
.include <bsd.port.mk>

10
security/libfprint/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libfprint-0.0.6.tar.bz2) = T0e0YCGxhkiLYKqpf5D+Qw==
RMD160 (libfprint-0.0.6.tar.bz2) = NnegmX2mQbo+hYYiLKiGQOH2Nz8=
SHA1 (libfprint-0.0.6.tar.bz2) = Qwr5Hvvv6yuY/jAhX7MwUeT478U=
SHA256 (libfprint-0.0.6.tar.bz2) = XRb62uy0MqtSypelkwHcjKg8rHXztXFFJmtWKh68xd0=
SIZE (libfprint-0.0.6.tar.bz2) = 431957
MD5 (libfprint-0.4.0.tar.bz2) = hEt2GKCV0kfCfu3OmTE+0g==
RMD160 (libfprint-0.4.0.tar.bz2) = 7zcjJXWbbdUnja2tnUoD3cxaOqs=
SHA1 (libfprint-0.4.0.tar.bz2) = 6AhTdXmmKYABVPH/umyKP2UBF8s=
SHA256 (libfprint-0.4.0.tar.bz2) = MY1cORDjenGhsrJ/5nZybsFMr6/i+G7L47FBLL4qITI=
SIZE (libfprint-0.4.0.tar.bz2) = 476262

12
security/libfprint/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2009/05/30 15:40:35 robert Exp $
--- configure.orig Sat May 30 19:27:19 2009
+++ configure Sat May 30 19:28:18 2009
@@ -20778,7 +20778,7 @@ cat >>confdefs.h <<\_ACEOF
#define API_EXPORTED __attribute__((visibility("default")))
_ACEOF
-AM_CFLAGS="-std=gnu99 -fgnu89-inline -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 -Wshadow"
ac_config_files="$ac_config_files libfprint.pc Makefile libfprint/Makefile examples/Makefile doc/Makefile"

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

@ -0,0 +1,47 @@
$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

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

@ -1,12 +1,21 @@
$OpenBSD: patch-libfprint_Makefile_in,v 1.1.1.1 2009/03/24 19:01:04 robert Exp $
--- libfprint/Makefile.in.orig Tue Mar 24 17:20:41 2009
+++ libfprint/Makefile.in Tue Mar 24 17:20:58 2009
@@ -275,7 +275,7 @@ NBIS_SRC = \
$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 $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
+libfprint_la_CFLAGS = -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
-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@
libfprint_la_LIBADD = -lm $(LIBUSB_LIBS) $(GLIB_LIBS) $(IMAGEMAGICK_LIBS) $(CRYPTO_LIBS)
libfprint_la_SOURCES = \
@@ -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

18
security/libfprint/patches/patch-libfprint_fp_internal_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libfprint_fp_internal_h,v 1.2 2009/10/27 06:16:03 jasper Exp $
--- libfprint/fp_internal.h.orig Thu Mar 20 14:37:33 2008
+++ libfprint/fp_internal.h Tue Oct 27 07:14:56 2009
@@ -62,6 +62,14 @@ void fpi_log(enum fpi_log_level, const char *component
#define fp_warn(fmt...) _fpi_log(LOG_LEVEL_WARNING, fmt)
#define fp_err(fmt...) _fpi_log(LOG_LEVEL_ERROR, fmt)
$OpenBSD: patch-libfprint_fp_internal_h,v 1.3 2012/02/22 09:30:20 dcoppa Exp $
--- libfprint/fp_internal.h.orig Fri Apr 8 16:35:37 2011
+++ libfprint/fp_internal.h Fri Nov 18 17:05:08 2011
@@ -93,6 +93,18 @@ enum fp_dev_state {
struct fp_driver **fprint_get_drivers (void);
+#if !defined(ENODATA) && defined(ENOENT)
+#define ENODATA ENOENT
@ -12,7 +12,11 @@ $OpenBSD: patch-libfprint_fp_internal_h,v 1.2 2009/10/27 06:16:03 jasper Exp $
+#if !defined(EPROTO) && defined(ENOPROTOOPT)
+#define EPROTO ENOPROTOOPT
+#endif
+
+#if !defined(ETIME) && defined(ETIMEDOUT)
+#define ETIME ETIMEDOUT
+#endif
+
struct fp_dev {
struct fp_driver *drv;
usb_dev_handle *udev;
libusb_device_handle *udev;