1.8.0-alt1

- 1.8.0
This commit is contained in:
kozorizki 2024-12-19 13:21:54 +03:00
parent d5d14b6c33
commit 77475f8810
11 changed files with 182 additions and 63 deletions

66
.idea/workspace.xml generated Normal file
View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
<list default="true" id="57201170-1e6a-49d5-8a4d-7c4757afd312" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MacroExpansionManager">
<option name="directoryName" value="kiw29hiv" />
</component>
<component name="ProjectColorInfo"><![CDATA[{
"customColor": "",
"associatedIndex": 0
}]]></component>
<component name="ProjectId" id="2qQlwyInVqwq30UIKAgnbdPO1kd" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.rust.reset.selective.auto.import": "true",
"git-widget-placeholder": "master",
"last_opened_file_path": "/home/konstantin/pve-spiceterm",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"org.rust.first.attach.projects": "true",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
</key>
</component>
<component name="RustProjectSettings">
<option name="toolchainHomeDirectory" value="$PROJECT_DIR$/../.cargo/bin" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="57201170-1e6a-49d5-8a4d-7c4757afd312" name="Changes" comment="" />
<created>1734602922547</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1734602922547</updated>
<workItem from="1734602923816" duration="1318000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

View File

@ -2,8 +2,8 @@
Name: pve-%sname
Summary: VNC Terminal Emulator
Version: 1.7.1
Release: alt2
Version: 1.8.0
Release: alt1
License: GPLv2
Group: Networking/WWW
Url: https://git.proxmox.com/
@ -40,6 +40,9 @@ install -m0644 %SOURCE2 .
%_man1dir/%sname.1*
%changelog
* Thu Dec 19 2024 Konstantin Kozoriz <kozorizki@altlinux.org> 1.8.0-alt1
- 1.8.0
* Tue Oct 31 2023 Alexey Sheplyakov <asheplyakov@altlinux.org> 1.7.1-alt2
- Build on LoongArch

Binary file not shown.

Binary file not shown.

View File

@ -2,16 +2,18 @@ include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/architecture.mk
PACKAGE=vncterm
GITVERSION:=$(shell cat .git/refs/heads/master)
BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
VNCVER=0.9.13
VNCREL=LibVNCServer-${VNCVER}
VNCDIR=libvncserver-${VNCREL}
VNCSRC=${VNCREL}.tar.gz
VNCLIB=${VNCDIR}/libvncserver.a
VNCVER=0.9.14
VNCREL=LibVNCServer-$(VNCVER)
VNCDIR=libvncserver-$(VNCREL)
VNCSRC=$(VNCREL).tar.gz
VNCLIB=$(VNCDIR)/libvncserver.a
DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
DBG_DEB=${PACKAGE}-dbgysm_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
DSC = $(PACKAGE)_$(DEB_VERSION).dsc
DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
CPPFLAGS += -O2 -g -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I $(VNCDIR)
@ -27,13 +29,13 @@ genfont2: genfont2.c
gcc -g -O2 -o $@ genfont2.c -Wall -Wextra -D_GNU_SOURCE -lz
.PHONY: vnc
vnc: ${VNCLIB}
${VNCLIB}: ${VNCSRC}
rm -rf ${VNCDIR}
tar xf ${VNCSRC}
ln -s ../vncpatches ${VNCDIR}/patches
cd ${VNCDIR}; quilt push -a
cd ${VNCDIR}; cmake -D WITH_GNUTLS=OFF -D WITH_OPENSSL=OFF -D WITH_WEBSOCKETS=OFF -D WITH_SYSTEMD=OFF -D WITH_TIGHTVNC_FILETRANSFER=OFF -D WITH_GCRYPT=OFF -D WITH_LZO=OFF -D BUILD_SHARED_LIBS=OFF .; cmake --build .
vnc: $(VNCLIB)
$(VNCLIB): $(VNCSRC)
rm -rf $(VNCDIR)
tar xf $(VNCSRC)
ln -s ../vncpatches $(VNCDIR)/patches
cd $(VNCDIR); quilt push -a
cd $(VNCDIR); cmake -D WITH_GNUTLS=OFF -D WITH_OPENSSL=OFF -D WITH_WEBSOCKETS=OFF -D WITH_SYSTEMD=OFF -D WITH_TIGHTVNC_FILETRANSFER=OFF -D WITH_GCRYPT=OFF -D WITH_LZO=OFF -D BUILD_SHARED_LIBS=OFF .; cmake --build .
vncterm: vncterm.c wchardata.c $(VNCLIB)
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(VNC_LIBS)
@ -43,39 +45,55 @@ wchardata.c:
.PHONY: install
install: vncterm vncterm.1 font.data
mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
install -m 0644 copyright ${DESTDIR}/usr/share/doc/${PACKAGE}
mkdir -p ${DESTDIR}/usr/share/${PACKAGE}
install -m 0644 font.data ${DESTDIR}/usr/share/${PACKAGE}
mkdir -p ${DESTDIR}/usr/share/man/man1
install -m 0644 vncterm.1 ${DESTDIR}/usr/share/man/man1
mkdir -p ${DESTDIR}/usr/bin
install -m 0755 vncterm ${DESTDIR}/usr/bin
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)
install -m 0644 font.data $(DESTDIR)/usr/share/$(PACKAGE)
mkdir -p $(DESTDIR)/usr/share/man/man1
install -m 0644 vncterm.1 $(DESTDIR)/usr/share/man/man1
mkdir -p $(DESTDIR)/usr/bin
install -m 0755 vncterm $(DESTDIR)/usr/bin
.PHONY: dinstall
dinstall: ${DEB}
dpkg -i ${DEB}
dinstall: $(DEB)
dpkg -i $(DEB)
vncterm.1: vncterm.pod
rm -f $@
pod2man -n $< -s 1 -r ${DEB_VERSION_UPSTREAM} <$< >$@
pod2man -n $< -s 1 -r $(DEB_VERSION_UPSTREAM) <$< >$@
$(BUILDDIR):
rm -rf $@ $@.tmp
rsync -a . $@.tmp
echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout $$(git rev-parse HEAD)" > $@.tmp/debian/SOURCE
mv $@.tmp $@
.PHONY: deb
deb: $(DEB)
${DEB}:
$(MAKE) clean
rsync -a . --exclude build build
echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout ${GIVERSION}" > build/debian/SOURCE
cd build; dpkg-buildpackage -rfakeroot -b -us -uc
lintian ${DEB}
$(DEB): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -rfakeroot -b -us -uc
lintian $(DEB)
.PHONY: dsc
dsc: $(DSC)
rm -rf $(BUILDDIR) $(DSC)
$(MAKE) $(DSC)
lintian $(DSC)
$(DSC): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -S -us -uc
sbuild: $(DSC)
sbuild $<
.PHONY: upload
upload: ${DEB}
tar cf - ${DEB} ${DBG_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
upload: $(DEB)
tar cf - $(DEB) $(DBG_DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
.PHONY: clean
clean:
rm -rf vncterm vncterm.1 vncterm_*.deb genfont genfont2 *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes wchardata.c font.data.tmp font.data *.buildinfo
rm -f *.dsc *.deb $(PACKAGE)*.tar* *.changes *.build *.buildinfo
rm -f vncterm vncterm.1 genfont genfont2 *~ *.tmp wchardata.c font.data
rm -rf $(VNCDIR) $(PACKAGE)-[0-9]*/
.PHONY: distclean
distclean: clean

View File

@ -1,20 +0,0 @@
Copyright (C) 2007 Proxmox Server Solutions GmbH
Copyright: vncterm is under GNU GPL, the GNU General Public License.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
The complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.

View File

@ -1,3 +1,11 @@
vncterm (1.8.0) bookworm; urgency=medium
* re-build for Debian 12 Bookworm based releases
* update libvncserver to 0.9.14
-- Proxmox Support Team <support@proxmox.com> Mon, 29 May 2023 17:10:38 +0200
vncterm (1.7-1) bullseye; urgency=medium
* rebuild for Debian 11 Bullseye based releases

View File

@ -1 +0,0 @@
12

View File

@ -1,26 +1,27 @@
Source: vncterm
Section: admin
Priority: optional
Maintainer: Proxmox Support Team <support@proxmox.com>
Build-Depends: cmake,
debhelper (>= 12~),
debhelper-compat (= 12),
libglib2.0-dev,
libgnutls28-dev,
libjpeg62-turbo-dev,
libpng-dev,
quilt,
tar,
unifont,
zlib1g-dev,
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Package: vncterm
Architecture: any
Section: x11
Priority: optional
Depends: libc6 (>= 2.7-18),
libgnutls-deb0-28 | libgnutls30,
Depends: libgnutls-deb0-28 | libgnutls30,
libjpeg62-turbo,
libpng16-16,
zlib1g (>= 1:1.2.1),
${misc:Depends},
${shlibs:Depends},
Description: VNC Terminal Emulator
With vncterm you can start commands and export its standard input and

43
vncterm/debian/copyright Normal file
View File

@ -0,0 +1,43 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: git://git.proxmox.com/git/vncterm.git
Files:
*
Copyright: 2007 - 2023, Proxmox Support Team <support@proxmox.com>
License: AGPL-3.0-or-later
This program is free software: you can redistribute it and/or modify it under
the terms of the GNU Affero General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option) any
later version.
.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
details.
.
You should have received a copy of the GNU Affero General Public License along
with this program. If not, see <https://www.gnu.org/licenses/>.
Comment:
The authors take the provided option to use the LibVNC as GPL 2 *or later*,
and use it as GPL 3, allowing combination with our AGPLv3 code.
Files:
LibVNCServer-*.tar*
Copyright: 2001-2003, Johannes E. Schindelin
2001 - 2022, The LibVNC Authors
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this package; if not, see &lt;https://www.gnu.org/licenses/&gt;.
Comment:
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.

View File

@ -0,0 +1 @@
3.0 (native)