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

- update to amtterm-1.6 (this swithes the port to use vte3)

Browse Source 
- add patch from upstream to address a memory leak
This commit is contained in:
jasper 2020-11-02 16:10:23 +00:00
parent 4409fc2bb6
commit 956fb99f83
4 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
comms/amtterm/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2020/11/02 06:17:36 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2020/11/02 16:10:23 jasper Exp $
COMMENT-term= cli client for Intel AMT serial-over-lan
COMMENT-main= client and tools for Intel AMT serial-over-lan
V= 1.4
V= 1.6
DISTNAME= amtterm-$V
REVISION= 5
PKGNAME-main= amtterm-$V
PKGNAME-term= amtterm-cli-$V
MULTI_PACKAGES= -main -term
@ -18,17 +17,15 @@ HOMEPAGE= https://www.kraxel.org/blog/linux/amtterm/
PERMIT_PACKAGE= Yes
WANTLIB-term += c
WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB-main += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB-main += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB-main += gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-main += vte z
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
WANTLIB += pangocairo-1.0 vte-2.91
MASTER_SITES= https://www.kraxel.org/releases/amtterm/
LIB_DEPENDS-term=
LIB_DEPENDS-main= devel/gettext,-runtime \
devel/vte
devel/vte3
RUN_DEPENDS-main= comms/amtterm,-term \
devel/desktop-file-utils \
www/p5-SOAP-Lite

4
comms/amtterm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (amtterm-1.4.tar.gz) = 4QrysC2/Zvskq9KSud3G2Gsx7qCYh9pcsOuPsu6QDiE=
SIZE (amtterm-1.4.tar.gz) = 38445
SHA256 (amtterm-1.6.tar.gz) = EkLOpGeCeqHi6RtBhGIpygpbPz4JJgsN+deNyHUHVZA=
SIZE (amtterm-1.6.tar.gz) = 40804

13
comms/amtterm/patches/patch-mk_Maintainer_mk
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-mk_Maintainer_mk,v 1.1.1.1 2012/06/02 12:09:35 sthen Exp $
--- mk/Maintainer.mk.orig Sat Jun 2 09:16:01 2012
+++ mk/Maintainer.mk Sat Jun 2 09:15:53 2012
$OpenBSD: patch-mk_Maintainer_mk,v 1.2 2020/11/02 16:10:23 jasper Exp $
Index: mk/Maintainer.mk
--- mk/Maintainer.mk.orig
+++ mk/Maintainer.mk
@@ -12,7 +12,7 @@ sync:: distclean
chmod 444 $(srcdir)/INSTALL $(srcdir)/mk/*.mk
-repository := $(shell basename $(PWD))
+repository := $(shell basename $$(pwd))
-repository := $(shell basename $(PWD))
+repository := $(shell basename $$(pwd))
usetito := $(shell if test -d .tito; then echo yes; else echo no; fi)
release-dir ?= $(HOME)/projects/Releases
release-pub ?= bigendian.kraxel.org:/public/vhosts/www.kraxel.org/releases/$(repository)
tarball = $(release-dir)/$(repository)-$(VERSION).tar

35
comms/amtterm/patches/patch-parseconfig_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-parseconfig_c,v 1.1 2020/11/02 16:10:23 jasper Exp $
https://git.kraxel.org/cgit/amtterm/commit/?id=ea1717899294af93f7342069b15fc197b525ad29
Index: parseconfig.c
--- parseconfig.c.orig
+++ parseconfig.c
@@ -558,17 +558,24 @@ cfg_write_file(char *dname, char *filename)
if (-1 == unlink(bfile) && ENOENT != errno) {
fprintf(stderr,"unlink(%s): %s\n",bfile,strerror(errno));
- return -1;
+ goto err;
}
if (-1 == rename(filename,bfile) && ENOENT != errno) {
fprintf(stderr,"rename(%s,%s): %s\n",filename,bfile,strerror(errno));
- return -1;
+ goto err;
}
if (-1 == rename(tfile,filename)) {
fprintf(stderr,"rename(%s,%s): %s\n",tfile,filename,strerror(errno));
- return -1;
+ goto err;
}
+ free(bfile);
+ free(tfile);
return 0;
+
+err:
+ free(bfile);
+ free(tfile);
+ return -1;
}
/* ------------------------------------------------------------------------ */