Skip to content

Commit

Permalink
Restore three ports removed too early and assume their maintainership.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Dec 31, 2022
1 parent c1d08cc commit a95989d
Show file tree
Hide file tree
Showing 21 changed files with 347 additions and 3 deletions.
3 changes: 0 additions & 3 deletions MOVED
Expand Up @@ -17721,9 +17721,6 @@ lang/ponyc||2022-12-31|Has expired: Very outdated and unsupported upstream, depe
www/varnish4|www/varnish6|2022-12-31|Has expired: End of life upstream, users are recommended to upgrade to 6.x or higher
devel/unittest-cpp||2022-12-31|Has expired: Upstream have declared hiatus status since 2+ years back. Please consider using devel/googletest instead
math/libpgmath||2022-12-31|Has expired: Depends on end of life devel/llvm70
security/libfprint||2022-12-31|Has expired: Very outdated, unsupported upstream which now have systemd as a non optional requirement
security/fprint_demo||2022-12-31|Has expired: Depends on deprecated library libfprint
security/fprintd||2022-12-31|Has expired: Very outdated, unsupported upstream which now have systemd as a non optional requirement
cad/linux-eagle5||2022-12-31|Has expired: Deprecated upstream, superseded by Autodesk EAGLE 9
net-p2p/amule-devel|net-p2p/amule|2022-12-31|Has expired: Superseded by non development port
graphics/comical||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
Expand Down
3 changes: 3 additions & 0 deletions security/Makefile
Expand Up @@ -152,6 +152,8 @@
SUBDIR += flawfinder
SUBDIR += fpc-gnutls
SUBDIR += fpc-openssl
SUBDIR += fprint_demo
SUBDIR += fprintd
SUBDIR += fragroute
SUBDIR += fragrouter
SUBDIR += fswatch
Expand Down Expand Up @@ -273,6 +275,7 @@
SUBDIR += libdecaf
SUBDIR += libecc
SUBDIR += libfido2
SUBDIR += libfprint
SUBDIR += libgcrypt
SUBDIR += libgnome-keyring
SUBDIR += libgpg-error
Expand Down
25 changes: 25 additions & 0 deletions security/fprint_demo/Makefile
@@ -0,0 +1,25 @@
PORTNAME= fprint_demo
PORTVERSION= 20080303
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= DEBIAN/pool/main/f/${PORTNAME:C/_/-/}
DISTNAME= ${PORTNAME:C/_/-/}_${PORTVERSION}git.orig

MAINTAINER= danfe@FreeBSD.org
COMMENT= Demo and test application for libfprint
WWW= http://www.reactivated.net/fprint/wiki/Fprint_demo

LIB_DEPENDS= libfprint.so:security/libfprint

USES= autoreconf desktop-file-utils gnome pkgconfig
USE_GNOME= atk glib20 gtk20 pango

NO_WRKSUBDIR= yes

GNU_CONFIGURE= yes
CONFIGURE_ENV= CRYPTO_CFLAGS=-I${OPENSSLINC} \
CRYPTO_LIBS=-lcrypto

CFLAGS+= -DHAVE_MEMMEM

.include <bsd.port.mk>
3 changes: 3 additions & 0 deletions security/fprint_demo/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1275601092
SHA256 (fprint-demo_20080303git.orig.tar.gz) = fcff7f6e8d61b253b88dd87ecf5cdb5418ecf11178ce7cb6ae0e350485045232
SIZE (fprint-demo_20080303git.orig.tar.gz) = 77714
3 changes: 3 additions & 0 deletions security/fprint_demo/pkg-descr
@@ -0,0 +1,3 @@
fprint_demo is a simple GTK+ application to demonstrate and
test libfprint's capabilities. It can be used to enroll new finger prints
as well as verify and delete existing data sets.
24 changes: 24 additions & 0 deletions security/fprint_demo/pkg-message
@@ -0,0 +1,24 @@
[
{ type: install
message: <<EOM
In order to enroll new finger prints, you must have r/w access to the
usb device node(s) of your finger print reader (i.e., /dev/{ugen, usb}*).

It is recommended to use devfs.rules(5) and a dedicated group to manage
access to your finger print reader.

You can use `usbconfig' to see if your sensor is accessible.

Example configuration:
- /etc/rc.conf:
devfs_system_ruleset="localrules"

- /etc/devfs.rules:
[localrules=10]
add path 'usb' mode 0770 group operator
add path 'usb/*' mode 0660 group operator

# /etc/rc.d/devfs restart
EOM
}
]
7 changes: 7 additions & 0 deletions security/fprint_demo/pkg-plist
@@ -0,0 +1,7 @@
bin/fprint_demo
share/applications/fprint_demo.desktop
share/icons/hicolor/128x128/apps/fprint_demo.png
share/icons/hicolor/16x16/apps/fprint_demo.png
share/icons/hicolor/22x22/apps/fprint_demo.png
share/icons/hicolor/48x48/apps/fprint_demo.png
share/icons/hicolor/scalable/apps/fprint_demo.svg
43 changes: 43 additions & 0 deletions security/fprintd/Makefile
@@ -0,0 +1,43 @@
PORTNAME= fprintd
DISTVERSIONPREFIX= V_
DISTVERSION= 0_8_1
CATEGORIES= security

MAINTAINER= danfe@FreeBSD.org
COMMENT= Daemon that provides fingerprint scanning functionality over D-Bus
WWW= https://www.freedesktop.org/wiki/Software/fprint/fprintd/

LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libfprint.so:security/libfprint \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libpolkit-gobject-1.so:sysutils/polkit

USES= autoreconf:build gettext gmake gnome libtool pkgconfig
USE_GNOME= intltool glib20

USE_GITHUB= yes
GH_ACCOUNT= freedesktop
GH_PROJECT= libfprint-${PORTNAME}

GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
MAKE_ARGS= sysconfdir="${ETCDIR}/"

OPTIONS_DEFINE= NLS PAM
OPTIONS_SUB= yes

NLS_CONFIGURE_ENABLE= nls
PAM_CONFIGURE_ENABLE= pam

# Remove doc build ; Doesn't install with/without
# Also less deps needed
pre-configure:
${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)

.include <bsd.port.mk>
3 changes: 3 additions & 0 deletions security/fprintd/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1549285491
SHA256 (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 7370e500ad9228194c575f915e215668d5d42958decc0485024f8dbfd646d21a
SIZE (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 92276
46 changes: 46 additions & 0 deletions security/fprintd/files/patch-git_06bab8
@@ -0,0 +1,46 @@
Obtained from:
https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/0c6bab8640b3586ac8e1b8c35d87aa49b79719d0.patch

From 0c6bab8640b3586ac8e1b8c35d87aa49b79719d0 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 23 Jan 2020 17:37:33 +0100
Subject: [PATCH] main: Fix redeclaration linking error

Fix linking error as the "store" global variable gets redeclared in
each C file that includes the header. Move the actual declaration to
main.c.

Fixes:
/usr/bin/ld: ./.libs/libfprintd.a(device.o):/builds/libfprint/fprintd/src/storage.h:51: multiple definition of `store'; main.o:/builds/libfprint/fprintd/src/storage.h:51: first defined here
---
src/main.c | 2 ++
src/storage.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 8f7e19c..ce1a47d 100644
--- src/main.c
+++ src/main.c
@@ -33,6 +33,8 @@
#include "storage.h"
#include "file_storage.h"

+fp_storage store;
+
extern DBusGConnection *fprintd_dbus_conn;
static gboolean no_timeout = FALSE;
static gboolean g_fatal_warnings = FALSE;
diff --git a/src/storage.h b/src/storage.h
index d908c59..28ed2b6 100644
--- src/storage.h
+++ src/storage.h
@@ -46,4 +46,4 @@ struct storage {
typedef struct storage fp_storage;

/* The currently setup store */
-fp_storage store;
+extern fp_storage store;
--
GitLab


11 changes: 11 additions & 0 deletions security/fprintd/pkg-descr
@@ -0,0 +1,11 @@
Fprintd is a D-Bus daemon that offers libfprint functionality over
the D-Bus interprocess communication bus. By adding this daemon
layer above libfprint, we solve various problems related to multiple
applications simultaneously competing for fingerprint readers.

While it is not very nice to think of a daemon being necessary in
this scenario, fprintd will be launched by D-Bus through the
activation mechanism. This means it is launched only when needed,
and additionally it will shut itself down after a period of inactivity.

(Text copied from link below.)
85 changes: 85 additions & 0 deletions security/fprintd/pkg-plist
@@ -0,0 +1,85 @@
bin/fprintd-delete
bin/fprintd-enroll
bin/fprintd-list
bin/fprintd-verify
%%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
%%ETCDIR%%/fprintd.conf
%%PAM%%lib/security/pam_fprintd.a
%%PAM%%lib/security/pam_fprintd.so
libexec/fprintd
share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
share/dbus-1/system-services/net.reactivated.Fprint.service
%%NLS%%share/locale/ar/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/as/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ast/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/az/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/be/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/bg/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ca/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/cs/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/cy/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/da/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/de/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/el/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/eo/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/es/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/et/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/eu/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/fa/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/fi/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/fo/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/fur/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ga/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/gl/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/gu/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/he/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/hi/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/hr/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/hu/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ia/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/id/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/it/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ja/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ka/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/kk/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/kn/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ko/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/lt/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/lv/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ml/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/mr/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ms/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/nb/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/nl/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/nn/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/oc/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/or/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/pa/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/pl/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/pt/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ro/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ru/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sk/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sl/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sq/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sr/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/sv/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/ta/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/te/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/th/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/tr/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/uk/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/vi/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/wa/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
man/man1/fprintd.1.gz
share/polkit-1/actions/net.reactivated.fprint.device.policy
27 changes: 27 additions & 0 deletions security/libfprint/Makefile
@@ -0,0 +1,27 @@
PORTNAME= libfprint
PORTVERSION= 0.7.0
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://people.freedesktop.org/~anarsoul/

MAINTAINER= danfe@FreeBSD.org
COMMENT= Library for fingerprint reader devices
WWW= http://www.reactivated.net/fprint/wiki/Libfprint

LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libnss3.so:security/nss \
libnspr4.so:devel/nspr

GNU_CONFIGURE= yes
USES= gnome libtool magick:6 pathfix pkgconfig tar:xz xorg
USE_LDCONFIG= yes
USE_GNOME= glib20
USE_XORG= pixman
INSTALL_TARGET= install-strip

CPPFLAGS+= -DHAVE_MEMMEM
MAKE_JOBS_UNSAFE=yes

.include <bsd.port.mk>
3 changes: 3 additions & 0 deletions security/libfprint/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1532525845
SHA256 (libfprint-0.7.0.tar.xz) = 863eee8cf4cbc56776cf08e5b98e30e130f3394b6db95bf8e01addb6bf08f1f3
SIZE (libfprint-0.7.0.tar.xz) = 550484
11 changes: 11 additions & 0 deletions security/libfprint/files/patch-config.h.in
@@ -0,0 +1,11 @@
--- config.h.in.orig 2017-05-14 16:27:23 UTC
+++ config.h.in
@@ -140,3 +140,8 @@
#ifndef __cplusplus
#undef inline
#endif
+
+/* FreeBSD >=8 */
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
11 changes: 11 additions & 0 deletions security/libfprint/files/patch-libfprint-drivers-vfs301.c
@@ -0,0 +1,11 @@
--- libfprint/drivers/vfs301.c.orig 2017-01-05 17:18:55 UTC
+++ libfprint/drivers/vfs301.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>

#include "vfs301_proto.h"
#include <unistd.h>
11 changes: 11 additions & 0 deletions security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c
@@ -0,0 +1,11 @@
--- libfprint/drivers/vfs301_proto.c.orig 2013-01-12 13:18:37 UTC
+++ libfprint/drivers/vfs301_proto.c
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>

#include "vfs301_proto.h"
#include "vfs301_proto_fragments.h"
11 changes: 11 additions & 0 deletions security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h
@@ -0,0 +1,11 @@
--- libfprint/drivers/vfs301_proto.h.orig 2013-01-12 13:18:37 UTC
+++ libfprint/drivers/vfs301_proto.h
@@ -18,7 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>

enum {
VFS301_DEFAULT_WAIT_TIMEOUT = 300,
11 changes: 11 additions & 0 deletions security/libfprint/files/patch-libfprint_Makefile.in
@@ -0,0 +1,11 @@
--- libfprint/Makefile.in.orig 2017-05-14 16:27:17 UTC
+++ libfprint/Makefile.in
@@ -1578,7 +1578,7 @@ info: info-am

info-am:

-install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA
+install-data-am: install-pkgincludeHEADERS

install-dvi: install-dvi-am

3 changes: 3 additions & 0 deletions security/libfprint/pkg-descr
@@ -0,0 +1,3 @@
libfprint is an open source software library designed to make it easy for
application developers to add support for consumer fingerprint readers to
their software.
6 changes: 6 additions & 0 deletions security/libfprint/pkg-plist
@@ -0,0 +1,6 @@
include/libfprint/fprint.h
lib/libfprint.a
lib/libfprint.so
lib/libfprint.so.0
lib/libfprint.so.0.0.0
libdata/pkgconfig/libfprint.pc

0 comments on commit a95989d

Please sign in to comment.