Attachment #227857 for bug #258354




# Created by: Vasil Dimov <vd@FreeBSD.org>

PORTNAME=	libpano13
PORTVERSION=	2.9.20
PORTREVISION=	1
CATEGORIES=	graphics java
MASTER_SITES=	SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	fuz@fuz.su
COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers

LICENSE=	GPLv2+

LIB_DEPENDS=	libpng.so:graphics/png \
		libtiff.so:graphics/tiff

USES=		cmake jpeg libtool pathfix

USES=		autoreconf gnome jpeg libtool pathfix
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include/gtk-2.0 \
		-I${LOCALBASE}/include/glib-2.0 \
		-I${LOCALBASE}/include/pango-1.0 \
		-I${LOCALBASE}/include/atk-1.0
CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
		--with-jpeg=${LOCALBASE} \
		--with-tiff=${LOCALBASE}
INSTALL_TARGET=	install-strip

USE_LDCONFIG=	yes

OPTIONS_DEFINE=	JAVA DOCS
OPTIONS_SUB=	yes
JAVA_USE=	java=yes
JAVA_CMAKE_BOOL=	SUPPORT_JAVA_PROGRAMS
JAVA_VARS=	JAVA_OS=native
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA=	yes
JAVA_OS=	native
CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
.else
CONFIGURE_ARGS+=	--without-java
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/graphics/libpano13/distinfo (-2 / +3 lines)
1	SHA256 (libpano13-2.9.19.tar.gz) = 037357383978341dea8f572a5d2a0876c5ab0a83dffda431bd393357e91d95a8	1	TIMESTAMP = 1631016195
2	SIZE (libpano13-2.9.19.tar.gz) = 3527845	2	SHA256 (libpano13-2.9.20.tar.gz) = 3b532836c37b8cd75cd2227fd9207f7aca3fdcbbd1cce3b9749f056a10229b89
		3	SIZE (libpano13-2.9.20.tar.gz) = 3564544




--- CMakeLists.txt.orig	2021-09-12 09:38:50 UTC
+++ CMakeLists.txt
@@ -116,7 +116,7 @@ FIND_PACKAGE(PNG REQUIRED)
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
 
-set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} m)
 
 #
 # Check build type and set options accordingly
@@ -314,7 +314,7 @@ INSTALL(
 	AUTHORS
 	COPYING
 	README
-  DESTINATION "share/pano13/doc"
+  DESTINATION "share/doc/libpano13"
   COMPONENT headers
         )
 INSTALL(
@@ -323,7 +323,7 @@ INSTALL(
         doc/PTblender.readme
         doc/PTmender.readme
         doc/stitch.txt
-  DESTINATION "share/pano13/doc"
+  DESTINATION "share/doc/libpano13"
   COMPONENT doc
         )
 




--- Makefile.am.orig	2019-03-30 16:47:30 UTC
+++ Makefile.am
@@ -94,13 +94,23 @@ install-exec-hook:
 
 endif
 
-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG)
+if HAVE_FREEBSD
+LIN_SRC =  sys_ansi.c sys_compat_unix.c ppm.c
+LIN_DEFS = -D__Ansi__=1
+LIN_LDFS = -version-info 3:0:0 -lm
 
+install-exec-hook:
+	@true
+
+endif
+
+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
+
 lib_LTLIBRARIES = libpano13.la
 
-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
 libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(FBSD_LDFS)
 libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
 
 pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)




--- configure.ac.orig	Fri Jun 16 13:30:54 2006
+++ configure.ac	Wed Jan 17 10:40:32 2007
@@ -45,6 +45,11 @@
 		;;
 	esac
 	;;
+  *freebsd*|dragonfly)
+    PANO_WIN32_RESOURCE=
+    HSYS=freebsd
+    HCPU="${target_cpu}"
+    ;;
   *darwin*)
     PANO_WIN32_RESOURCE=
     HSYS=darwin
@@ -73,6 +78,7 @@
 
 AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
 AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
+AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
 AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
 AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")




--- m4/ax_check_graphics.m4.orig	Wed Jan 17 11:09:58 2007
+++ m4/ax_check_graphics.m4	Wed Jan 17 11:11:53 2007
@@ -44,7 +44,7 @@
   ZLIB_OLD_LDFLAGS=$LDFLAGS
   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
   if test "x$ZLIB_HOME" != 'x' ; then
-    if test "x$HCPU" = 'xamd64' ; then
+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
     else
       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
@@ -69,7 +69,7 @@
         LIB_ZLIB="-lz"
         ZLIB_FLAGS="-DHasZLIB"
       else
-        if test "x$HCPU" = 'xamd64' ; then
+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
           LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
         else
           LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
@@ -133,7 +133,7 @@
   PNG_OLD_LDFLAGS=$LDFLAGS
   PNG_OLD_CPPFLAGS=$CPPFLAGS
   if test "x$PNG_HOME" != 'x' ; then
-    if test "x$HCPU" = 'xamd64' ; then
+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
     else
       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
@@ -158,7 +158,7 @@
         LIB_PNG="-lpng"
         PNG_FLAGS="-DHasPNG"
       else
-        if test "x$HCPU" = 'xamd64' ; then
+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
           LIB_PNG="-L$PNG_HOME/lib64 -lpng"
         else
           LIB_PNG="-L$PNG_HOME/lib -lpng"
@@ -224,7 +224,7 @@
   JPEG_OLD_LDFLAGS=$LDFLAGS
   JPEG_OLD_CPPFLAGS=$CPPFLAGS
   if test "x$JPEG_HOME" != 'x' ; then
-    if test "x$HCPU" = 'xamd64' ; then
+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
     else
       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
@@ -274,7 +274,7 @@
         LIB_JPEG="-ljpeg"
         JPEG_FLAGS="-DHasJPEG"
       else
-        if test "x$HCPU" = 'xamd64' ; then
+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
           LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
         else
           LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
@@ -339,7 +339,7 @@
   TIFF_OLD_LDFLAGS=$LDFLAGS
   TIFF_OLD_CPPFLAGS=$CPPFLAGS
   if test "x$TIFF_HOME" != 'x' ; then
-    if test "x$HCPU" = 'xamd64' ; then
+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
     else
       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
@@ -364,7 +364,7 @@
         LIB_TIFF="-ltiff"
         TIFF_FLAGS="-DHasTIFF"
       else
-        if test "x$HCPU" = 'xamd64' ; then
+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
           LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
         else
           LIB_TIFF="-L$TIFF_HOME/lib -ltiff"




--- m4/ax_check_java.m4.orig	Wed Jan 17 11:23:05 2007
+++ m4/ax_check_java.m4	Wed Jan 17 11:25:08 2007
@@ -2,7 +2,7 @@
 dnl Usage:
 dnl AX_CHECK_JAVA
 dnl Test for java, and defines
-dnl - JAVA_CFLAGS (compiler flags)
+dnl - JAVA_FLAGS (compiler flags)
 dnl - LIB_JAVA (linker flags, stripping and path)
 dnl prerequisites:
 
@@ -78,6 +78,9 @@
   case "${target_os}" in
     linux*)
       java_extra_inc=linux
+      ;;
+    *freebsd*)
+      java_extra_inc=freebsd
       ;;
     darwin*)
       java_extra_inc=darwin




--- tools/Makefile.am.orig	2010-09-07 23:45:22.000000000 +0300
+++ tools/Makefile.am	2011-01-09 22:07:41.000000000 +0200
@@ -40,7 +40,15 @@
 SOL_DEFS = 
 endif
 
-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
+if HAVE_FREEBSD
+FBSD_SRC = panoinfo_unix.c
+FBSD_DEFS = -D__Ansi__=1
+else
+FBSD_SRC =
+FBSD_DEFS =
+endif
+
+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
 AM_LDFLAGS  = -L${top_builddir}
 
 # PTAInterpolate can only be compiled with ptpicker.h, which in turn depends on java
@@ -85,7 +93,7 @@
 PToptimizer_SOURCES = PToptimizer.c
 PToptimizer_LDADD   = -l${PANOLIB}
 
-panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
+panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
 panoinfo_LDADD      = -l${PANOLIB}
 
 EXTRA_DIST = README.PTmender \




include/pano13/ptutils.h
include/pano13/queryfeature.h
include/pano13/version.h
lib/libpano13.a
lib/libpano13.so
lib/libpano13.so.3
lib/libpano13.so.3.0.0
libdata/pkgconfig/libpano13.pc
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/Optimize.txt
%%PORTDOCS%%%%DOCSDIR%%/PTblender.readme
%%PORTDOCS%%%%DOCSDIR%%/PTmender.readme
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/stitch.txt
share/man/man1/PTAInterpolate.1.gz
share/man/man1/PTblender.1.gz
share/man/man1/PTcrop.1.gz
share/man/man1/PTinfo.1.gz
share/man/man1/PTmasker.1.gz
share/man/man1/PTmender.1.gz
share/man/man1/PToptimizer.1.gz
share/man/man1/PTroller.1.gz
share/man/man1/PTtiff2psd.1.gz
share/man/man1/PTtiffdump.1.gz
share/man/man1/PTuncrop.1.gz
share/man/man1/panoinfo.1.gz




  <vuln vid="15e74795-0fd7-11ec-9f2e-dca632b19f10">
    <topic>libpano13 -- arbitrary memory access through format string vulnerability</topic>
    <affects>
      <package>
	<name>libpano13</name>
	<range><lt>2.9.20</lt></range>
      </package>
    </affects>
    <description>
      <body xmlns="http://www.w3.org/1999/xhtml">
	<p>libpano13-2.9.20 release notes state:</p>
	<blockquote cite="https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.20/README.txt">
	  <p>Fix crash and security issue caused by malformed filename prefix</p>
	</blockquote>
      </body>
    </description>
    <references>
      <cvename>CVE-2021-20307</cvename>
      <url>https://nvd.nist.gov/vuln/detail/CVE-2021-20307</url>
    </references>
    <dates>
      <discovery>2021-05-04</discovery>
      <entry>2021-09-07</entry>
    </dates>
  </vuln>

  <vuln vid="376df2f1-1295-11ec-859e-000c292ee6b8">
    <topic>consul -- rpc: authorize raft requests</topic>
    <affects>
- 

Return to bug 258354

Lines 1-12 Link Here

(-)b/graphics/libpano13/Makefile (-27 / +7 lines)
1	# Created by: Vasil Dimov <vd@FreeBSD.org>	1	# Created by: Vasil Dimov <vd@FreeBSD.org>
2		2
3	PORTNAME= libpano13	3	PORTNAME= libpano13
4	PORTVERSION= 2.9.19	4	PORTVERSION= 2.9.20
5	PORTREVISION= 1
6	CATEGORIES= graphics java	5	CATEGORIES= graphics java
7	MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}	6	MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= fuz@fuz.su
10	COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers	9	COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers
11		10
12	LICENSE= GPLv2+	11	LICENSE= GPLv2+
Lines 15-46 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
15	LIB_DEPENDS= libpng.so:graphics/png \	14	LIB_DEPENDS= libpng.so:graphics/png \
16	libtiff.so:graphics/tiff	15	libtiff.so:graphics/tiff
17		16
18	USE_GNOME= gtk20 glib20 pango atk	17	USES= cmake jpeg libtool pathfix
19
20	USES= autoreconf gnome jpeg libtool pathfix
21	GNU_CONFIGURE= yes
22	CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
23	-I${LOCALBASE}/include/glib-2.0 \
24	-I${LOCALBASE}/include/pango-1.0 \
25	-I${LOCALBASE}/include/atk-1.0
26	CONFIGURE_ARGS= --with-png=${LOCALBASE} \
27	--with-jpeg=${LOCALBASE} \
28	--with-tiff=${LOCALBASE}
29	INSTALL_TARGET= install-strip
30
31	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
32		19
33	OPTIONS_DEFINE= JAVA	20	OPTIONS_DEFINE= JAVA DOCS
34	OPTIONS_SUB= yes	21	OPTIONS_SUB= yes
35		22	JAVA_USE= java=yes
36	.include <bsd.port.options.mk>	23	JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS
37		24	JAVA_VARS= JAVA_OS=native
38	.if ${PORT_OPTIONS:MJAVA}
39	USE_JAVA= yes
40	JAVA_OS= native
41	CONFIGURE_ARGS+= --with-java=${JAVA_HOME}
42	.else
43	CONFIGURE_ARGS+= --without-java
44	.endif
45		25
46	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/libpano13/files/patch-CMakeLists.txt (+29 lines)
1	--- CMakeLists.txt.orig 2021-09-12 09:38:50 UTC
2	+++ CMakeLists.txt
3	@@ -116,7 +116,7 @@ FIND_PACKAGE(PNG REQUIRED)
4	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
5	INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
6
7	-set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
8	+set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} m)
9
10	#
11	# Check build type and set options accordingly
12	@@ -314,7 +314,7 @@ INSTALL(
13	AUTHORS
14	COPYING
15	README
16	- DESTINATION "share/pano13/doc"
17	+ DESTINATION "share/doc/libpano13"
18	COMPONENT headers
19	)
20	INSTALL(
21	@@ -323,7 +323,7 @@ INSTALL(
22	doc/PTblender.readme
23	doc/PTmender.readme
24	doc/stitch.txt
25	- DESTINATION "share/pano13/doc"
26	+ DESTINATION "share/doc/libpano13"
27	COMPONENT doc
28	)
29

Removed Link Here

(-)a/graphics/libpano13/files/patch-Makefile.am (-29 lines)
1	--- Makefile.am.orig 2019-03-30 16:47:30 UTC
2	+++ Makefile.am
3	@@ -94,13 +94,23 @@ install-exec-hook:
4
5	endif
6
7	-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG)
8	+if HAVE_FREEBSD
9	+LIN_SRC = sys_ansi.c sys_compat_unix.c ppm.c
10	+LIN_DEFS = -D__Ansi__=1
11	+LIN_LDFS = -version-info 3:0:0 -lm
12
13	+install-exec-hook:
14	+ @true
15	+
16	+endif
17	+
18	+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
19	+
20	lib_LTLIBRARIES = libpano13.la
21
22	-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
23	+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
24	libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
25	-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
26	+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(FBSD_LDFS)
27	libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
28
29	pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)

Removed Link Here

(-)a/graphics/libpano13/files/patch-configure.ac (-22 lines)
1	--- configure.ac.orig Fri Jun 16 13:30:54 2006
2	+++ configure.ac Wed Jan 17 10:40:32 2007
3	@@ -45,6 +45,11 @@
4	;;
5	esac
6	;;
7	+ freebsd\|dragonfly)
8	+ PANO_WIN32_RESOURCE=
9	+ HSYS=freebsd
10	+ HCPU="${target_cpu}"
11	+ ;;
12	darwin)
13	PANO_WIN32_RESOURCE=
14	HSYS=darwin
15	@@ -73,6 +78,7 @@
16
17	AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
18	AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
19	+AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
20	AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
21	AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
22	AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")

Removed Link Here

(-)a/graphics/libpano13/files/patch-m4_ax_check_graphics.m4 (-74 lines)
1	--- m4/ax_check_graphics.m4.orig Wed Jan 17 11:09:58 2007
2	+++ m4/ax_check_graphics.m4 Wed Jan 17 11:11:53 2007
3	@@ -44,7 +44,7 @@
4	ZLIB_OLD_LDFLAGS=$LDFLAGS
5	ZLIB_OLD_CPPFLAGS=$CPPFLAGS
6	if test "x$ZLIB_HOME" != 'x' ; then
7	- if test "x$HCPU" = 'xamd64' ; then
8	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
9	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
10	else
11	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
12	@@ -69,7 +69,7 @@
13	LIB_ZLIB="-lz"
14	ZLIB_FLAGS="-DHasZLIB"
15	else
16	- if test "x$HCPU" = 'xamd64' ; then
17	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
18	LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
19	else
20	LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
21	@@ -133,7 +133,7 @@
22	PNG_OLD_LDFLAGS=$LDFLAGS
23	PNG_OLD_CPPFLAGS=$CPPFLAGS
24	if test "x$PNG_HOME" != 'x' ; then
25	- if test "x$HCPU" = 'xamd64' ; then
26	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
27	LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
28	else
29	LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
30	@@ -158,7 +158,7 @@
31	LIB_PNG="-lpng"
32	PNG_FLAGS="-DHasPNG"
33	else
34	- if test "x$HCPU" = 'xamd64' ; then
35	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
36	LIB_PNG="-L$PNG_HOME/lib64 -lpng"
37	else
38	LIB_PNG="-L$PNG_HOME/lib -lpng"
39	@@ -224,7 +224,7 @@
40	JPEG_OLD_LDFLAGS=$LDFLAGS
41	JPEG_OLD_CPPFLAGS=$CPPFLAGS
42	if test "x$JPEG_HOME" != 'x' ; then
43	- if test "x$HCPU" = 'xamd64' ; then
44	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
45	LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
46	else
47	LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
48	@@ -274,7 +274,7 @@
49	LIB_JPEG="-ljpeg"
50	JPEG_FLAGS="-DHasJPEG"
51	else
52	- if test "x$HCPU" = 'xamd64' ; then
53	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
54	LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
55	else
56	LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
57	@@ -339,7 +339,7 @@
58	TIFF_OLD_LDFLAGS=$LDFLAGS
59	TIFF_OLD_CPPFLAGS=$CPPFLAGS
60	if test "x$TIFF_HOME" != 'x' ; then
61	- if test "x$HCPU" = 'xamd64' ; then
62	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
63	LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
64	else
65	LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
66	@@ -364,7 +364,7 @@
67	LIB_TIFF="-ltiff"
68	TIFF_FLAGS="-DHasTIFF"
69	else
70	- if test "x$HCPU" = 'xamd64' ; then
71	+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
72	LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
73	else
74	LIB_TIFF="-L$TIFF_HOME/lib -ltiff"

Removed Link Here

(-)a/graphics/libpano13/files/patch-m4_ax_check_java.m4 (-21 lines)
1	--- m4/ax_check_java.m4.orig Wed Jan 17 11:23:05 2007
2	+++ m4/ax_check_java.m4 Wed Jan 17 11:25:08 2007
3	@@ -2,7 +2,7 @@
4	dnl Usage:
5	dnl AX_CHECK_JAVA
6	dnl Test for java, and defines
7	-dnl - JAVA_CFLAGS (compiler flags)
8	+dnl - JAVA_FLAGS (compiler flags)
9	dnl - LIB_JAVA (linker flags, stripping and path)
10	dnl prerequisites:
11
12	@@ -78,6 +78,9 @@
13	case "${target_os}" in
14	linux*)
15	java_extra_inc=linux
16	+ ;;
17	+ freebsd)
18	+ java_extra_inc=freebsd
19	;;
20	darwin*)
21	java_extra_inc=darwin

Removed Link Here

(-)a/graphics/libpano13/files/patch-tools_Makefile.am (-28 lines)
1	--- tools/Makefile.am.orig 2010-09-07 23:45:22.000000000 +0300
2	+++ tools/Makefile.am 2011-01-09 22:07:41.000000000 +0200
3	@@ -40,7 +40,15 @@
4	SOL_DEFS =
5	endif
6
7	-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
8	+if HAVE_FREEBSD
9	+FBSD_SRC = panoinfo_unix.c
10	+FBSD_DEFS = -D__Ansi__=1
11	+else
12	+FBSD_SRC =
13	+FBSD_DEFS =
14	+endif
15	+
16	+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
17	AM_LDFLAGS = -L${top_builddir}
18
19	# PTAInterpolate can only be compiled with ptpicker.h, which in turn depends on java
20	@@ -85,7 +93,7 @@
21	PToptimizer_SOURCES = PToptimizer.c
22	PToptimizer_LDADD = -l${PANOLIB}
23
24	-panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
25	+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
26	panoinfo_LDADD = -l${PANOLIB}
27
28	EXTRA_DIST = README.PTmender \

Lines 20-38 include/pano13/pteditor.h Link Here

(-)b/graphics/libpano13/pkg-plist (-12 / +20 lines)
20	include/pano13/ptutils.h	20	include/pano13/ptutils.h
21	include/pano13/queryfeature.h	21	include/pano13/queryfeature.h
22	include/pano13/version.h	22	include/pano13/version.h
		23	lib/libpano13.a
23	lib/libpano13.so	24	lib/libpano13.so
24	lib/libpano13.so.3	25	lib/libpano13.so.3
25	lib/libpano13.so.3.0.0	26	lib/libpano13.so.3.0.0
26	libdata/pkgconfig/libpano13.pc	27	libdata/pkgconfig/libpano13.pc
27	man/man1/PTAInterpolate.1.gz	28	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
28	man/man1/PTblender.1.gz	29	%%PORTDOCS%%%%DOCSDIR%%/COPYING
29	man/man1/PTcrop.1.gz	30	%%PORTDOCS%%%%DOCSDIR%%/Optimize.txt
30	man/man1/PTinfo.1.gz	31	%%PORTDOCS%%%%DOCSDIR%%/PTblender.readme
31	man/man1/PTmasker.1.gz	32	%%PORTDOCS%%%%DOCSDIR%%/PTmender.readme
32	man/man1/PTmender.1.gz	33	%%PORTDOCS%%%%DOCSDIR%%/README
33	man/man1/PToptimizer.1.gz	34	%%PORTDOCS%%%%DOCSDIR%%/stitch.txt
34	man/man1/PTroller.1.gz	35	share/man/man1/PTAInterpolate.1.gz
35	man/man1/PTtiff2psd.1.gz	36	share/man/man1/PTblender.1.gz
36	man/man1/PTtiffdump.1.gz	37	share/man/man1/PTcrop.1.gz
37	man/man1/PTuncrop.1.gz	38	share/man/man1/PTinfo.1.gz
38	man/man1/panoinfo.1.gz	39	share/man/man1/PTmasker.1.gz
		40	share/man/man1/PTmender.1.gz
		41	share/man/man1/PToptimizer.1.gz
		42	share/man/man1/PTroller.1.gz
		43	share/man/man1/PTtiff2psd.1.gz
		44	share/man/man1/PTtiffdump.1.gz
		45	share/man/man1/PTuncrop.1.gz
		46	share/man/man1/panoinfo.1.gz

Lines 1-3 Link Here

(-)b/security/vuxml/vuln-2021.xml (-1 / +26 lines)
		1	<vuln vid="15e74795-0fd7-11ec-9f2e-dca632b19f10">
		2	<topic>libpano13 -- arbitrary memory access through format string vulnerability</topic>
		3	<affects>
		4	<package>
		5	<name>libpano13</name>
		6	<range><lt>2.9.20</lt></range>
		7	</package>
		8	</affects>
		9	<description>
		10	<body xmlns="http://www.w3.org/1999/xhtml">
		11	<p>libpano13-2.9.20 release notes state:</p>
		12	<blockquote cite="https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.20/README.txt">
		13	<p>Fix crash and security issue caused by malformed filename prefix</p>
		14	</blockquote>
		15	</body>
		16	</description>
		17	<references>
		18	<cvename>CVE-2021-20307</cvename>
		19	<url>https://nvd.nist.gov/vuln/detail/CVE-2021-20307</url>
		20	</references>
		21	<dates>
		22	<discovery>2021-05-04</discovery>
		23	<entry>2021-09-07</entry>
		24	</dates>
		25	</vuln>
		26
1	<vuln vid="376df2f1-1295-11ec-859e-000c292ee6b8">	27	<vuln vid="376df2f1-1295-11ec-859e-000c292ee6b8">
2	<topic>consul -- rpc: authorize raft requests</topic>	28	<topic>consul -- rpc: authorize raft requests</topic>
3	<affects>	29	<affects>
4	-