Revert "Merge pull request #1 from freedesktop/master"

This reverts commit 89ecba4, reversing
changes made to 5a963b7.

Author: rootd

.gitlab-ci.yml

@@ -1,5 +1,4 @@
 include:
-  - local: '.gitlab-ci/libfprint-image-variables.yaml'
   - local: '.gitlab-ci/libfprint-templates.yaml'
   - project: 'freedesktop/ci-templates'
     ref: master
@@ -8,15 +7,14 @@ include:
 
 variables:
   extends: .libfprint_common_variables
-  FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
+  FDO_DISTRIBUTION_TAG: latest
   FDO_DISTRIBUTION_VERSION: rawhide
   FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
   FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
   BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
   LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
 
 stages:
-  - image-build
   - check-source
   - build
   - test
@@ -71,11 +69,6 @@ test:
     - ninja -C _build coverage
     - cat _build/meson-logs/coverage.txt
   artifacts:
-    reports:
-      junit: "_build/meson-logs/testlog.junit.xml"
-      coverage_report:
-        coverage_format: cobertura
-        path: _build/meson-logs/coverage.xml
     expose_as: 'Coverage Report'
     when: always
     paths:
@@ -94,8 +87,6 @@ test_valgrind:
     - ninja -C _build
     - meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
   artifacts:
-    reports:
-      junit: "_build/meson-logs/testlog.junit.xml"
     expose_as: 'Valgrind test logs'
     when: always
     paths:
@@ -127,7 +118,7 @@ test_indent:
   script:
     - scripts/uncrustify.sh
     - git diff
-    - git diff-index --name-only --exit-code HEAD
+    - "! git status -s | grep -q ."
 
 test_unsupported_list:
   stage: check-source
@@ -141,8 +132,7 @@ test_unsupported_list:
 flatpak:
   stage: flatpak
   extends: .flatpak
-  # From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42
+  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.36
   variables:
     MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
     FLATPAK_MODULE: "libfprint"
@@ -163,12 +153,11 @@ flatpak:
       allow_failure: true
 
 # CONTAINERS creation stage
-.container_fedora_build_base:
+container_fedora_build:
   extends: .fdo.container-build@fedora
-  stage: image-build
   only:
     variables:
-      - $CI_PIPELINE_SOURCE == "never"
+      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     FDO_FORCE_REBUILD: 1
@@ -179,27 +168,7 @@ flatpak:
       libpcap-devel
       libudev-devel
     FDO_DISTRIBUTION_EXEC: |
-      $LIBFPRINT_EXEC
-
-container_fedora_build_schedule:
-  extends: .container_fedora_build_base
-  only:
-    variables:
-      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
-
-container_fedora_build_manual:
-  extends: .container_fedora_build_base
-  only:
-    variables:
-      - $LIBFPRINT_CI_ACTION == "build-image"
-
-container_fedora_build_on_deps_changed:
-  extends: .container_fedora_build_base
-  only:
-    variables:
-      - $CI_PROJECT_NAMESPACE == "libfprint" && $CI_PIPELINE_SOURCE != "schedule"
-    refs:
-      - branches
-      - merge_requests
-    changes:
-      - .gitlab-ci/libfprint-image-variables.yaml
+      git clone https://github.com/martinpitt/umockdev.git && \
+        cd umockdev && \
+        meson _build --prefix=/usr && \
+        ninja -C _build && ninja -C _build install

.gitlab-ci/libfprint-image-variables.yaml

@@ -1,10 +1,6 @@
-# Bump image version on .gitlab-ci/libfprint-image-variables.yaml to trigger
-# a rebuild on changes to this file
-
 .libfprint_common_variables:
   LIBFPRINT_DEPENDENCIES:
     doxygen
-    dnf-plugins-core
     flatpak-builder
     gcc
     gcc-c++
@@ -31,17 +27,3 @@
     valgrind
     clang-analyzer
     diffutils
-
-  LIBFPRINT_EXEC: |
-    dnf debuginfo-install -y \
-      glib2 \
-      glibc \
-      libgusb \
-      libusb \
-      nss \
-      pixman
-
-    git clone https://github.com/martinpitt/umockdev.git && \
-        cd umockdev && \
-        meson _build --prefix=/usr && \
-        ninja -C _build && ninja -C _build install

.gitlab-ci/libfprint-templates.yaml

@@ -1,18 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
-2022-10-13: v1.94.5 release
-
-Highlights:
- * New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors
- * goodixmoc: New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A.
- * goodixmoc: Support resetting device on firmware failure due to corrupted DB.
- * elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d.
- * synaptics: New PID 0x0104.
- * upektc: New PID 0x2017.
- * Fixed various memory leaks
- * More tests
-
 2022-05-24: v1.94.4 release
 
 Highlights:

NEWS

@@ -1,86 +1,54 @@
+# libfprint
 
-
-<div align="center">
-
-# LibFPrint
-
-*LibFPrint is part of the **[FPrint][Website]** project.*
-
-<br/>
-
-[![Button Website]][Website]
-[![Button Documentation]][Documentation]
-
-[![Button Supported]][Supported]
-[![Button Unsupported]][Unsupported]
-
-[![Button Contribute]][Contribute]
-[![Button Contributors]][Contributors]
-
-</div>
+libfprint is part of the fprint project:
+https://fprint.freedesktop.org/
 
 ## History
 
-**LibFPrint** was originally developed as part of an
-academic project at the **[University Of Manchester]**.
-
-It aimed to hide the differences between consumer
-fingerprint scanners and provide a single uniform
-API to application developers.
-
-## Goal
+libfprint was originally developed as part of an academic project at the
+University of Manchester with the aim of hiding differences between different
+consumer fingerprint scanners and providing a single uniform API to application
+developers. The ultimate goal of the fprint project is to make fingerprint
+scanners widely and easily usable under common Linux environments.
 
-The ultimate goal of the **FPrint** project is to make
-fingerprint scanners widely and easily usable under
-common Linux environments.
+The academic university project runs off a codebase maintained separately
+from this one, although I try to keep them as similar as possible (I'm not
+hiding anything in the academic branch, it's just the open source release
+contains some commits excluded from the academic project).
 
 ## License
 
-`Section 6` of the license states that for compiled works that use
-this library, such works must include **LibFPrint** copyright notices
-alongside the copyright notices for the other parts of the work.
-
-**LibFPrint** includes code from **NIST's** **[NBIS]** software distribution.
-
-We include **Bozorth3** from the **[US Export Controlled]**
-distribution, which we have determined to be fine
-being shipped in an open source project.
-
-<br/>
-
-<div align="right">
-
-[![Badge License]][License]
-
-</div>
-
-
-<!----------------------------------------------------------------------------->
-
-[Documentation]: https://fprint.freedesktop.org/libfprint-dev/
-[Contributors]: https://gitlab.freedesktop.org/libfprint/libfprint/-/graphs/master
-[Unsupported]: https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices
-[Supported]: https://fprint.freedesktop.org/supported-devices.html
-[Website]: https://fprint.freedesktop.org/
+THE UNIVERSITY OF MANCHESTER DOES NOT ENDORSE THIS THIS SOFTWARE RELEASE AND
+IS IN NO WAY RESPONSIBLE FOR THE CODE CONTAINED WITHIN, OR ANY DAMAGES CAUSED
+BY USING OR DISTRIBUTING THE SOFTWARE. Development does not happen on
+university computers and the project is not hosted at the university either.
 
-[Contribute]: ./HACKING.md
-[License]: ./COPYING
+For more information on libfprint, supported devices, API documentation, etc.,
+see the homepage:
+https://fprint.freedesktop.org/
 
-[University Of Manchester]: https://www.manchester.ac.uk/
-[US Export Controlled]: https://fprint.freedesktop.org/us-export-control.html
-[NBIS]: http://fingerprint.nist.gov/NBIS/index.html
+libfprint is licensed under the GNU LGPL version 2.1. See the COPYING file
+for the license text.
 
+Section 6 of the license states that for compiled works that use this
+library, such works must include libfprint copyright notices alongside the
+copyright notices for the other parts of the work. We have attempted to
+make this process slightly easier for you by grouping these all in one place:
+the AUTHORS file.
 
-<!---------------------------------[ Badges ]---------------------------------->
+libfprint includes code from NIST's NBIS software distribution:
+http://fingerprint.nist.gov/NBIS/index.html
+We include bozorth3 from the US export controlled distribution. We have
+determined that it is fine to ship bozorth3 in an open source project,
+see https://fprint.freedesktop.org/us-export-control.html
 
-[Badge License]: https://img.shields.io/badge/License-LGPL2.1-015d93.svg?style=for-the-badge&labelColor=blue
+## Historical links
 
+Older versions of libfprint are available at:
+https://sourceforge.net/projects/fprint/files/
 
-<!---------------------------------[ Buttons ]--------------------------------->
+Historical mailing-list archives:
+http://www.reactivated.net/fprint_list_archives/
 
-[Button Documentation]: https://img.shields.io/badge/Documentation-04ACE6?style=for-the-badge&logoColor=white&logo=BookStack
-[Button Contributors]: https://img.shields.io/badge/Contributors-FF4F8B?style=for-the-badge&logoColor=white&logo=ActiGraph
-[Button Unsupported]: https://img.shields.io/badge/Unsupported_Devices-EF2D5E?style=for-the-badge&logoColor=white&logo=AdBlock
-[Button Contribute]: https://img.shields.io/badge/Contribute-66459B?style=for-the-badge&logoColor=white&logo=Git
-[Button Supported]: https://img.shields.io/badge/Supported_Devices-428813?style=for-the-badge&logoColor=white&logo=AdGuard
-[Button Website]: https://img.shields.io/badge/Homepage-3B80AE?style=for-the-badge&logoColor=white&logo=freedesktopDotOrg
+Historical website:
+http://web.archive.org/web/*/https://www.freedesktop.org/wiki/Software/fprint/

README.md

@@ -147,8 +147,6 @@ usb:v04F3p0C7D*
 usb:v04F3p0C7E*
 usb:v04F3p0C82*
 usb:v04F3p0C88*
-usb:v04F3p0C8C*
-usb:v04F3p0C8D*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -157,24 +155,10 @@ usb:v1C7Ap0603*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
-# Supported by libfprint driver fpcmoc
-usb:v10A5pFFE0*
-usb:v10A5pA305*
-usb:v10A5pDA04*
-usb:v10A5pD805*
-usb:v10A5pD205*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
-usb:v27C6p6014*
-usb:v27C6p6094*
 usb:v27C6p609C*
 usb:v27C6p60A2*
-usb:v27C6p631C*
-usb:v27C6p634C*
-usb:v27C6p6384*
 usb:v27C6p639C*
 usb:v27C6p63AC*
 usb:v27C6p63BC*
@@ -184,7 +168,6 @@ usb:v27C6p6584*
 usb:v27C6p658C*
 usb:v27C6p6592*
 usb:v27C6p6594*
-usb:v27C6p659A*
 usb:v27C6p659C*
 usb:v27C6p6A94*
  ID_AUTOSUSPEND=1
@@ -209,7 +192,6 @@ usb:v06CBp0126*
 usb:v06CBp0129*
 usb:v06CBp0168*
 usb:v06CBp015F*
-usb:v06CBp0104*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -222,7 +204,6 @@ usb:v147Ep1001*
 
 # Supported by libfprint driver upektc
 usb:v0483p2015*
-usb:v0483p2017*
 usb:v147Ep3001*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
@@ -284,13 +265,7 @@ usb:v04F3p0C00*
 usb:v04F3p0C4C*
 usb:v04F3p0C57*
 usb:v04F3p0C5E*
-usb:v04F3p0C5A*
-usb:v04F3p0C70*
-usb:v04F3p0C72*
 usb:v04F3p2706*
-usb:v04F3p3057*
-usb:v04F3p3104*
-usb:v04F3p310D*
 usb:v06CBp0081*
 usb:v06CBp0088*
 usb:v06CBp008A*
@@ -345,32 +320,26 @@ usb:v1C7Ap0576*
 usb:v27C6p5042*
 usb:v27C6p5110*
 usb:v27C6p5117*
-usb:v27C6p5120*
 usb:v27C6p5125*
 usb:v27C6p5201*
 usb:v27C6p521D*
 usb:v27C6p5301*
 usb:v27C6p530C*
 usb:v27C6p532D*
-usb:v27C6p5335*
 usb:v27C6p533C*
 usb:v27C6p5381*
 usb:v27C6p5385*
 usb:v27C6p538C*
 usb:v27C6p538D*
 usb:v27C6p5395*
 usb:v27C6p5503*
-usb:v27C6p550A*
-usb:v27C6p550C*
 usb:v27C6p5584*
 usb:v27C6p55A2*
 usb:v27C6p55A4*
 usb:v27C6p55B4*
 usb:v27C6p5740*
 usb:v27C6p5E0A*
-usb:v27C6p581A*
 usb:v2808p9338*
-usb:v2808p93A9*
 usb:v298Dp2020*
 usb:v298Dp2033*
 usb:v3538p0930*