Attachment 228462 Details for Bug 242144 – update to 0.3.2.51

update to 0.3.2.51

airsaned-0.3.2.51.shar (text/plain), 7.71 KB, created by J.R. Oldroyd on 2021-10-05 14:01:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2021-10-05 14:01:36 UTC

Size: 7.71 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	graphics/airsaned/
>#	graphics/airsaned/Makefile
>#	graphics/airsaned/distinfo
>#	graphics/airsaned/files
>#	graphics/airsaned/files/patch-CMakeLists.txt
>#	graphics/airsaned/files/airsaned.in
>#	graphics/airsaned/files/patch-zeroconf-hotplugnotifier.cpp
>#	graphics/airsaned/files/patch-imageformats-pngencoder.cpp
>#	graphics/airsaned/files/patch-server-server.cpp
>#	graphics/airsaned/files/patch-web-httpserver.cpp
>#	graphics/airsaned/pkg-descr
>#
>echo c - graphics/airsaned/
>mkdir -p graphics/airsaned/ > /dev/null 2>&1
>echo x - graphics/airsaned/Makefile
>sed 's/^X//' >graphics/airsaned/Makefile << 'a6761547495e8fe99bd9ab6b0ae70b98'
>XPORTNAME=	airsaned
>XDISTVERSIONPREFIX=	v
>XDISTVERSION=	0.3.2-51
>XDISTVERSIONSUFFIX=	-g145ea99
>XCATEGORIES=	graphics
>X
>XMAINTAINER=	fbsd@opal.com
>XCOMMENT=	Apple AirScan compatible SANE web frontend
>X
>XLICENSE=	GPLv3
>XLICENSE_FILE=	${WRKSRC}/LICENSE
>X
>XLIB_DEPENDS=	libavahi-client.so:net/avahi-app \
>X		libpng.so:graphics/png \
>X		libsane.so:graphics/sane-backends
>X
>XUSES=		cmake jpeg compiler:c++11-lib localbase:ldflags
>XUSE_GITHUB=	yes
>XUSE_RC_SUBR=	${PORTNAME}
>X
>XGH_ACCOUNT=	SimulPiscator
>XGH_PROJECT=	AirSane
>X
>XPLIST_FILES=	sbin/airsaned \
>X		etc/airsane/ignore.conf \
>X		etc/airsane/options.conf \
>X		etc/airsane/Gnome-scanner.png
>X
>X.include <bsd.port.mk>
>a6761547495e8fe99bd9ab6b0ae70b98
>echo x - graphics/airsaned/distinfo
>sed 's/^X//' >graphics/airsaned/distinfo << 'ace061ae0aed5ce585aa4b147538f127'
>XTIMESTAMP = 1633441590
>XSHA256 (SimulPiscator-AirSane-v0.3.2-51-g145ea99_GH0.tar.gz) = e1a43f1985504b3f09d3176c15fc5fedee5006ddeb5a1a6b75434753183b734c
>XSIZE (SimulPiscator-AirSane-v0.3.2-51-g145ea99_GH0.tar.gz) = 115699
>ace061ae0aed5ce585aa4b147538f127
>echo c - graphics/airsaned/files
>mkdir -p graphics/airsaned/files > /dev/null 2>&1
>echo x - graphics/airsaned/files/patch-CMakeLists.txt
>sed 's/^X//' >graphics/airsaned/files/patch-CMakeLists.txt << 'ddbd5b9799ae22263428e055462a82a9'
>X--- CMakeLists.txt.orig	2021-09-18 16:22:32 UTC
>X+++ CMakeLists.txt
>X@@ -66,6 +66,7 @@ add_executable(${PROJECT_NAME}
>X     zeroconf/hotplugnotifier.cpp
>X     ${ZEROCONF_FILES}
>X )
>X+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
>X target_link_libraries(
>X     ${PROJECT_NAME}
>X     Threads::Threads
>X@@ -73,8 +74,19 @@ target_link_libraries(
>X     jpeg
>X     png
>X     ${ZEROCONF_LIBS}
>X+    usb
>X+)
>X+else()
>X+target_link_libraries(
>X+    ${PROJECT_NAME}
>X+    Threads::Threads
>X+    sane
>X+    jpeg
>X+    png
>X+    ${ZEROCONF_LIBS}
>X     usb-1.0
>X )
>X+endif()
>X 
>X if(APPLE)
>X 
>X@@ -101,6 +113,28 @@ install(CODE "
>X     endif()
>X ")
>X 
>X+
>X+elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
>X+
>X+install(TARGETS ${PROJECT_NAME}
>X+    RUNTIME DESTINATION sbin
>X+)
>X+
>X+install(CODE "
>X+    if(NOT EXISTS /usr/local/etc/airsane/ignore.conf)
>X+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION /usr/local/etc/airsane)
>X+    endif()
>X+")
>X+install(CODE "
>X+    if(NOT EXISTS /usr/local/etc/airsane/options.conf)
>X+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION /usr/local/etc/airsane)
>X+    endif()
>X+")
>X+install(CODE "
>X+    if(NOT EXISTS /usr/local/etc/airsane/Gnome-scanner.png)
>X+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION /usr/local/etc/airsane)
>X+    endif()
>X+")
>X 
>X else()
>X 
>ddbd5b9799ae22263428e055462a82a9
>echo x - graphics/airsaned/files/airsaned.in
>sed 's/^X//' >graphics/airsaned/files/airsaned.in << '3c87f777880aa4c448992d2e3c4b9bc1'
>X#!/bin/sh
>X
>X# PROVIDE: airsaned
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X#
>X# Add the following line to /etc/rc.conf[.local] to enable airsaned:
>X#	airsaned_enable="YES"
>X
>X. /etc/rc.subr
>X
>Xname=airsaned
>Xrcvar=airsaned_enable
>X
>Xload_rc_config airsane
>X
>X: ${airsaned_enable:="NO"}
>X: ${airsaned_args:=""}
>X
>Xcommand="%%PREFIX%%/sbin/${name}"
>Xcommand_args="${airsaned_args} &"
>Xsig_stop="KILL"
>X
>Xrun_rc_command "$1"
>3c87f777880aa4c448992d2e3c4b9bc1
>echo x - graphics/airsaned/files/patch-zeroconf-hotplugnotifier.cpp
>sed 's/^X//' >graphics/airsaned/files/patch-zeroconf-hotplugnotifier.cpp << 'fc990630456aab87eb78116f18cde6e6'
>X--- zeroconf/hotplugnotifier.cpp.orig	2021-10-05 12:35:03 UTC
>X+++ zeroconf/hotplugnotifier.cpp
>X@@ -20,7 +20,11 @@ along with this program.  If not, see <http://www.gnu.
>X 
>X #include <atomic>
>X #include <csignal>
>X+#ifdef __FreeBSD__
>X+#include <libusb.h>
>X+#else
>X #include <libusb-1.0/libusb.h>
>X+#endif
>X #include <pthread.h>
>X #include <thread>
>X 
>fc990630456aab87eb78116f18cde6e6
>echo x - graphics/airsaned/files/patch-imageformats-pngencoder.cpp
>sed 's/^X//' >graphics/airsaned/files/patch-imageformats-pngencoder.cpp << '881795e8d00f3e3da6b5b85dab019e2b'
>X--- imageformats/pngencoder.cpp.orig	2021-10-05 12:35:03 UTC
>X+++ imageformats/pngencoder.cpp
>X@@ -17,11 +17,17 @@ along with this program.  If not, see <http://www.gnu.
>X */
>X 
>X #include "pngencoder.h"
>X+#ifdef __FreeBSD__
>X+#include <png.h>
>X+#else
>X #include <libpng16/png.h>
>X+#endif
>X #include <stdexcept>
>X #include <vector>
>X #if __APPLE__
>X #include <machine/endian.h>
>X+#elif __FreeBSD__
>X+#include <sys/endian.h>
>X #else
>X #include <endian.h>
>X #endif
>881795e8d00f3e3da6b5b85dab019e2b
>echo x - graphics/airsaned/files/patch-server-server.cpp
>sed 's/^X//' >graphics/airsaned/files/patch-server-server.cpp << '78ba1a9acda7d14faf867f10d5f192fe'
>X--- server/server.cpp.orig	2021-10-05 12:35:03 UTC
>X+++ server/server.cpp
>X@@ -103,11 +103,19 @@ Server::Server(int argc, char** argv)
>X       "ignore SANE network scanners",
>X       localonly },
>X     { "options-file",
>X+#ifdef __FreeBSD__
>X+      "/usr/local/etc/airsane/options.conf",
>X+#else
>X       "/etc/airsane/options.conf",
>X+#endif
>X       "location of device options file",
>X       optionsfile },
>X     { "ignore-list",
>X+#ifdef __FreeBSD__
>X+      "/usr/local/etc/airsane/ignore.conf",
>X+#else
>X       "/etc/airsane/ignore.conf",
>X+#endif
>X       "location of device ignore list",
>X       ignorelist },
>X     { "debug", "false", "log debug information to stderr", debug },
>78ba1a9acda7d14faf867f10d5f192fe
>echo x - graphics/airsaned/files/patch-web-httpserver.cpp
>sed 's/^X//' >graphics/airsaned/files/patch-web-httpserver.cpp << '4f7b5b130478c39c94cbce9afda8e97a'
>X--- web/httpserver.cpp.orig	2021-10-05 12:35:03 UTC
>X+++ web/httpserver.cpp
>X@@ -25,6 +25,9 @@ along with this program.  If not, see <http://www.gnu.
>X #include <thread>
>X 
>X #include <arpa/inet.h>
>X+#ifdef __FreeBSD__
>X+#include <netinet/in.h>
>X+#endif
>X #include <ifaddrs.h>
>X #include <net/if.h>
>X #include <netdb.h>
>4f7b5b130478c39c94cbce9afda8e97a
>echo x - graphics/airsaned/pkg-descr
>sed 's/^X//' >graphics/airsaned/pkg-descr << 'b499cc29528db8b6ef3a0e385da0cafd'
>XA SANE WebScan frontend that supports Apple's AirScan protocol.
>XScanners are detected automatically, and published through mDNS.
>XThough images may be acquired and transferred in JPEG, PNG, and
>XPDF/raster format through a simple web interface, AirSane's intended
>Xpurpose is to be used with AirScan/eSCL clients such as Apple's
>XImage Capture.
>X
>XImages are encoded on-the-fly during acquisition, keeping memory/storage
>Xdemands low. Thus, AirSane will run fine on a Raspberry Pi or similar
>Xdevice.
>X
>XAirSane has been developed by reverse-engineering the communication
>Xprotocol implemented in Apple's AirScanScanner client (macos 10.12.6,
>X/System/Library/Image Capture/Devices/AirScanScanner.app).
>X
>XAuthentication and secure communication are not supported.
>X
>XIf you are looking for a powerful SANE web frontend, AirSane may
>Xnot be for you. You may be interested in phpSANE instead.
>X
>XWWW: https://github.com/SimulPiscator/AirSane
>b499cc29528db8b6ef3a0e385da0cafd
>exit
>

Flags:

fbsd: maintainer-approval+

Actions: View

Attachments on bug 242144: 209322 | 209325 | 209711 | 228458 | 228459 | 228462