From 0b576513ae11e2570c8ccb505a1bd7f8d28550ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:03:28 +0000 Subject: [PATCH 001/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 664a1e1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: anyterm -# $Id: Makefile,v 1.1 2009/07/28 04:32:11 kevin Exp $ -NAME := anyterm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index f300d90..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -anyterm-1_1_29-8_fc10:HEAD:anyterm-1.1.29-8.fc10.src.rpm:1248795041 From 1b57692eb3901277f965364976834fdde34ef887 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:21:55 -0600 Subject: [PATCH 002/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 3d22d4e..98ee017 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -112,6 +112,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.29-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 15 2009 - 1.1.29-8 - correct anyterm dependency for anyterm-httpd subpkg - removed useradd/group add stdout redirection From ca78e1e689c341f83c580c205911acabe9308e9d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:20:07 -0600 Subject: [PATCH 003/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 98ee017..d7782c9 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -112,6 +112,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.29-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.1.29-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e9f1133021e305994cc0f8fa704656df81f78846 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 11:44:37 -0600 Subject: [PATCH 004/107] - Rebuilt for c++ ABI breakage --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d7782c9..689259e 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -112,6 +112,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 1.1.29-11 +- Rebuilt for c++ ABI breakage + * Thu Jan 12 2012 Fedora Release Engineering - 1.1.29-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 313c7954dedda759ebe1146f9263772534aea1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 11:31:58 +0200 Subject: [PATCH 005/107] Remove SysV script, add systemd service file. --- anyterm.service | 14 ++++++++++++++ anyterm.spec | 48 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 anyterm.service diff --git a/anyterm.service b/anyterm.service new file mode 100644 index 0000000..68acd49 --- /dev/null +++ b/anyterm.service @@ -0,0 +1,14 @@ +[Unit] +Description=Anyterm Web Based Terminal Emulator +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/anytermd.pid +ExecStart=/usr/sbin/anytermd -c /usr/libexec/anyterm/anyterm-cmd -s UTF8 --user anyterm --port 81 --local-only +RemainAfterExit=yes +PrivateTmp=true +PrivateNetwork=true + +[Install] +WantedBy=multi-user.target diff --git a/anyterm.spec b/anyterm.spec index 689259e..0c590ee 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -9,9 +9,8 @@ URL: http://anyterm.org Source0: http://anyterm.org/download/anyterm-1.1.29.tbz2 Source1: anyterm-cmd -Source2: anytermd.init -Source3: anytermd.sysconfig Source4: anyterm.conf +Source5: anyterm.service # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch @@ -23,11 +22,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: prelink +BuildRequires: systemd-units Requires(pre): shadow-utils -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv + %package httpd Summary: Httpd proxy configuration for anyterm @@ -65,9 +66,8 @@ execstack -c anytermd %{__install} -Dp -m0755 anytermd %{buildroot}%{_sbindir}/anytermd %{__install} -Dp -m0644 anytermd.1.gz %{buildroot}%{_mandir}/man1/anytermd.1.gz %{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd -%{__install} -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/anyterm -%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/anyterm %{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf +%{__install} -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service %{__mkdir} -p %{buildroot}%{_datadir}/anyterm/ for f in browser/*.{html,css,js,png,gif}; do @@ -88,23 +88,36 @@ getent passwd anyterm > /dev/null || \ exit 0 %post -# adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add anyterm +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ $1 = 0 ] ; then - /sbin/service anyterm stop >/dev/null 2>&1 - /sbin/chkconfig --del anyterm +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable anyterm.service > /dev/null 2>&1 || : + /bin/systemctl stop anyterm.service > /dev/null 2>&1 || : + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart anyterm.service >/dev/null 2>&1 || : fi +%triggerun -- anyterm < 1.1.29-12 +/usr/bin/systemd-sysv-convert --save anyterm >/dev/null 2>&1 ||: +/sbin/chkconfig --del anyterm >/dev/null 2>&1 || : +/bin/systemctl try-restart anyterm.service >/dev/null 2>&1 || : + %files %defattr(-,root,root,-) %{_sbindir}/anytermd %{_libexecdir}/anyterm/ %{_mandir}/man1/anytermd.1.gz -%{_initrddir}/anyterm %{_datadir}/anyterm/ -%config(noreplace) %{_sysconfdir}/sysconfig/anyterm +%{_unitdir}/anyterm.service %doc LICENSE %files httpd @@ -112,6 +125,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue May 22 2012 Alexander Boström - 1.1.29-12 +- Remove SysV script, add systemd service file. + * Tue Feb 28 2012 Fedora Release Engineering - 1.1.29-11 - Rebuilt for c++ ABI breakage From 5c6cb8004754dc5bffae2730510ce7beb4a71a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:09:38 +0200 Subject: [PATCH 006/107] Oh, loopback in PrivateNetwork is private. --- anyterm.service | 1 - 1 file changed, 1 deletion(-) diff --git a/anyterm.service b/anyterm.service index 68acd49..f206715 100644 --- a/anyterm.service +++ b/anyterm.service @@ -8,7 +8,6 @@ PIDFile=/var/run/anytermd.pid ExecStart=/usr/sbin/anytermd -c /usr/libexec/anyterm/anyterm-cmd -s UTF8 --user anyterm --port 81 --local-only RemainAfterExit=yes PrivateTmp=true -PrivateNetwork=true [Install] WantedBy=multi-user.target From ecfcfd777654ce6194b332407a49fae2f6d332f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:23:16 +0200 Subject: [PATCH 007/107] Fix regexp match. --- anyterm-cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm-cmd b/anyterm-cmd index 751624f..248acec 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -8,7 +8,7 @@ while : ; do read U # Make sure it does not start with a "-" and only contains valid # username characters. - if [[ "$U" =~ "^[A-Za-z0-9_][A-Za-z0-9_-]*\$" ]]; then + if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then ssh "$U@localhost" else echo "Bad username." From 12cda7f4bb773dd7f0e7b701ad85db0a829e99af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:25:46 +0200 Subject: [PATCH 008/107] anyterm-cmd: Don't ignore errors. --- anyterm-cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anyterm-cmd b/anyterm-cmd index 248acec..c511d68 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -3,13 +3,15 @@ # Simply prompt the user for a username and # ssh locally as that user +set -eo pipefail + while : ; do echo -n "Username: " read U # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then - ssh "$U@localhost" + ssh "$U@localhost" || : else echo "Bad username." fi From 5a7b652e2df160ec52b9fa60e5e06dd8e42c7375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:26:59 +0200 Subject: [PATCH 009/107] anyterm-cmd: Exit loop on empty username. --- anyterm-cmd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anyterm-cmd b/anyterm-cmd index c511d68..b7c916e 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -8,6 +8,10 @@ set -eo pipefail while : ; do echo -n "Username: " read U + if [[ -z "$U" ]]; then + echo "Disconnecting." + exit + fi # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then From 53e4e66d0b1e02e78594c413d0662d15cca262b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:27:48 +0200 Subject: [PATCH 010/107] anyterm-cmd: Use localdomain. --- anyterm-cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm-cmd b/anyterm-cmd index b7c916e..02b30dd 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -15,7 +15,7 @@ while : ; do # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then - ssh "$U@localhost" || : + ssh "$U@localhost.localdomain" || : else echo "Bad username." fi From f804745f1b672b2646d87875043af6b719f578d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 12:29:02 +0200 Subject: [PATCH 011/107] update changelog --- anyterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anyterm.spec b/anyterm.spec index 0c590ee..7102cb8 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -127,6 +127,7 @@ fi %changelog * Tue May 22 2012 Alexander Boström - 1.1.29-12 - Remove SysV script, add systemd service file. +- Fix anyterm-cmd. * Tue Feb 28 2012 Fedora Release Engineering - 1.1.29-11 - Rebuilt for c++ ABI breakage From e62ba41186b50e26b7a16cb7d1e77a79351b5871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 22 May 2012 13:20:22 +0200 Subject: [PATCH 012/107] anyterm-cmd: Fix indentation. --- anyterm-cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anyterm-cmd b/anyterm-cmd index 02b30dd..aa9df57 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -15,8 +15,8 @@ while : ; do # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then - ssh "$U@localhost.localdomain" || : + ssh "$U@localhost.localdomain" || : else - echo "Bad username." + echo "Bad username." fi done From bbe2516dc7d2a833685a7fab02ca455170639cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 22:29:43 +0200 Subject: [PATCH 013/107] add missing fi --- anyterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anyterm.spec b/anyterm.spec index 7102cb8..1395088 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -98,6 +98,7 @@ if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable anyterm.service > /dev/null 2>&1 || : /bin/systemctl stop anyterm.service > /dev/null 2>&1 || : +fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : From adba8f0129e1077fa6cbb2043f07cb2a6008352f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 22:31:51 +0200 Subject: [PATCH 014/107] spec file changelog --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 1395088..aa96ead 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -126,6 +126,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Jun 1 2012 Alexander Boström - 1.1.29-13 +- Fix spec file typo. + * Tue May 22 2012 Alexander Boström - 1.1.29-12 - Remove SysV script, add systemd service file. - Fix anyterm-cmd. From 6f0026aec170466bb92ecb600e598af141e19265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 22:54:53 +0200 Subject: [PATCH 015/107] Fix spec file typo. Create a home directory for the Anyterm user. --- anyterm-cmd | 10 ++++++++++ anyterm.spec | 22 +++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/anyterm-cmd b/anyterm-cmd index aa9df57..14c0f20 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -15,6 +15,16 @@ while : ; do # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then + if [[ ! -e ~/.ssh/known_hosts ]]; then + mkdir -p --mode=700 ~/.ssh + for k in /etc/ssh/ssh_host_{rsa,dsa}_key.pub; do + if [[ -r "$k" ]]; then + echo -n "localhost.localdomain " + cat "$k" + fi + done >.ssh/known_hosts + fi + ssh "$U@localhost.localdomain" || : else echo "Bad username." diff --git a/anyterm.spec b/anyterm.spec index aa96ead..81e0e2f 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -74,17 +74,27 @@ for f in browser/*.{html,css,js,png,gif}; do %{__install} -m644 "$f" %{buildroot}%{_datadir}/anyterm/ done +# Create a home directory for the user. +%{__mkdir} -m755 %{buildroot}%{_localstatedir}/run/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d +cat < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +d %{_localstatedir}/run/%{name} 0755 root %{name} +EOF + %clean rm -rf %{buildroot} %pre # create anyterm group / user -getent group anyterm >/dev/null || \ - /usr/sbin/groupadd -r anyterm -getent passwd anyterm > /dev/null || \ - /usr/sbin/useradd -r -s /sbin/nologin -d /dev/null \ - -M -c 'Anyterm user' -g anyterm anyterm +getent group %{name} >/dev/null 2>&1 || \ + groupadd -r %{name} +getent passwd %{name} >/dev/null 2>&1 || \ + useradd -r -l -g %{name} -s /sbin/nologin \ + -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} +if [[ $(getent passwd anyterm|cut -d: -f6) == "/dev/null" ]]; then + usermod -d %{_localstatedir}/run/%{name} %{name} +fi exit 0 %post @@ -119,6 +129,7 @@ fi %{_mandir}/man1/anytermd.1.gz %{_datadir}/anyterm/ %{_unitdir}/anyterm.service +%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name} %doc LICENSE %files httpd @@ -128,6 +139,7 @@ fi %changelog * Fri Jun 1 2012 Alexander Boström - 1.1.29-13 - Fix spec file typo. +- Create a home directory for the Anyterm user. * Tue May 22 2012 Alexander Boström - 1.1.29-12 - Remove SysV script, add systemd service file. From e68149e3554b54838167eca6fc0b00cdb68d4018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 23:07:49 +0200 Subject: [PATCH 016/107] create intermediate directories in buildroot --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 81e0e2f..eed0830 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -75,7 +75,7 @@ for f in browser/*.{html,css,js,png,gif}; do done # Create a home directory for the user. -%{__mkdir} -m755 %{buildroot}%{_localstatedir}/run/%{name} +%{__mkdir} -p -m755 %{buildroot}%{_localstatedir}/run/%{name} mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d cat < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf d %{_localstatedir}/run/%{name} 0755 root %{name} From d50c766510aff67d2b99e46023f91c49505770c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 23:14:22 +0200 Subject: [PATCH 017/107] add missing file --- anyterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anyterm.spec b/anyterm.spec index eed0830..3dbb502 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -130,6 +130,7 @@ fi %{_datadir}/anyterm/ %{_unitdir}/anyterm.service %ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name} +%{_sysconfdir}/tmpfiles.d/%{name}.conf %doc LICENSE %files httpd From 72c5f5798c0ec6966907737aee2635a9ad5d9b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 23:35:58 +0200 Subject: [PATCH 018/107] fix home directory creation when user exists --- anyterm.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 3dbb502..7e48368 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -92,7 +92,9 @@ getent group %{name} >/dev/null 2>&1 || \ getent passwd %{name} >/dev/null 2>&1 || \ useradd -r -l -g %{name} -s /sbin/nologin \ -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} -if [[ $(getent passwd anyterm|cut -d: -f6) == "/dev/null" ]]; then +if [[ ! -d %{buildroot}%{_localstatedir}/run/%{name} ]]; then + mkdir -m755 %{buildroot}%{_localstatedir}/run/%{name} + chown %{name}:%{name} %{buildroot}%{_localstatedir}/run/%{name} usermod -d %{_localstatedir}/run/%{name} %{name} fi exit 0 From 86c730339932459fca331d1add698b000f5593ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 23:42:07 +0200 Subject: [PATCH 019/107] not buildroot in pre script --- anyterm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 7e48368..25a8303 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -92,9 +92,9 @@ getent group %{name} >/dev/null 2>&1 || \ getent passwd %{name} >/dev/null 2>&1 || \ useradd -r -l -g %{name} -s /sbin/nologin \ -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} -if [[ ! -d %{buildroot}%{_localstatedir}/run/%{name} ]]; then - mkdir -m755 %{buildroot}%{_localstatedir}/run/%{name} - chown %{name}:%{name} %{buildroot}%{_localstatedir}/run/%{name} +if [[ ! -d %{_localstatedir}/run/%{name} ]]; then + mkdir -m755 %{_localstatedir}/run/%{name} + chown %{name}:%{name} %{_localstatedir}/run/%{name} usermod -d %{_localstatedir}/run/%{name} %{name} fi exit 0 From e43be79dcef5b2060a9604b6ea006d418226d1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 1 Jun 2012 23:55:46 +0200 Subject: [PATCH 020/107] silence usermod --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 25a8303..cf0fb3e 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -92,7 +92,7 @@ getent group %{name} >/dev/null 2>&1 || \ getent passwd %{name} >/dev/null 2>&1 || \ useradd -r -l -g %{name} -s /sbin/nologin \ -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} -if [[ ! -d %{_localstatedir}/run/%{name} ]]; then +if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then mkdir -m755 %{_localstatedir}/run/%{name} chown %{name}:%{name} %{_localstatedir}/run/%{name} usermod -d %{_localstatedir}/run/%{name} %{name} From 314deb896ab015eaf3d7805356701ba247d1d700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 2 Jun 2012 00:08:33 +0200 Subject: [PATCH 021/107] fix known_hosts creation --- anyterm-cmd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anyterm-cmd b/anyterm-cmd index 14c0f20..6d65573 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -15,8 +15,10 @@ while : ; do # Make sure it does not start with a "-" and only contains valid # username characters. if [[ "$U" =~ ^[A-Za-z0-9_][A-Za-z0-9_-]*$ ]]; then - if [[ ! -e ~/.ssh/known_hosts ]]; then - mkdir -p --mode=700 ~/.ssh + cd ~ + + if [[ ! -e .ssh/known_hosts ]]; then + mkdir -p --mode=700 .ssh for k in /etc/ssh/ssh_host_{rsa,dsa}_key.pub; do if [[ -r "$k" ]]; then echo -n "localhost.localdomain " From de39fa768173fc821d26ec383c991b1de309ece8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 2 Jun 2012 01:23:55 +0200 Subject: [PATCH 022/107] Actually create the home directory on first install. --- anyterm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index cf0fb3e..35199e5 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -91,7 +91,7 @@ getent group %{name} >/dev/null 2>&1 || \ groupadd -r %{name} getent passwd %{name} >/dev/null 2>&1 || \ useradd -r -l -g %{name} -s /sbin/nologin \ - -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} + -m -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then mkdir -m755 %{_localstatedir}/run/%{name} chown %{name}:%{name} %{_localstatedir}/run/%{name} @@ -140,6 +140,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Jun 1 2012 Alexander Boström - 1.1.29-14 +- Actually create the home directory on first install. + * Fri Jun 1 2012 Alexander Boström - 1.1.29-13 - Fix spec file typo. - Create a home directory for the Anyterm user. From d40c5145200b2d202861b64174d149f533e0ba4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 2 Jun 2012 12:28:15 +0200 Subject: [PATCH 023/107] make anyterm-cmd safer --- anyterm-cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm-cmd b/anyterm-cmd index 6d65573..d20b6e7 100644 --- a/anyterm-cmd +++ b/anyterm-cmd @@ -27,7 +27,7 @@ while : ; do done >.ssh/known_hosts fi - ssh "$U@localhost.localdomain" || : + ssh -l "$U" localhost.localdomain" || : else echo "Bad username." fi From 960cf2505ff9544036a4efcd3982b871d7efaa0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 2 Jun 2012 12:28:51 +0200 Subject: [PATCH 024/107] really really create the home directory --- anyterm.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 35199e5..7fbd0f9 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -91,10 +91,12 @@ getent group %{name} >/dev/null 2>&1 || \ groupadd -r %{name} getent passwd %{name} >/dev/null 2>&1 || \ useradd -r -l -g %{name} -s /sbin/nologin \ - -m -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} -if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then + -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} +if [[ ! -d %{_localstatedir}/run/%{name} ]]; then mkdir -m755 %{_localstatedir}/run/%{name} chown %{name}:%{name} %{_localstatedir}/run/%{name} +fi +if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then usermod -d %{_localstatedir}/run/%{name} %{name} fi exit 0 From 9d1cf7c1d98990f5ca9191daf8143964e7caf586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 2 Jun 2012 12:30:07 +0200 Subject: [PATCH 025/107] changelog, rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 7fbd0f9..52562ac 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -142,6 +142,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Jun 2 2012 Alexander Boström - 1.1.29-15 +- Really create the home directory. + * Fri Jun 1 2012 Alexander Boström - 1.1.29-14 - Actually create the home directory on first install. From b45b2e99aad992023c1db14638a6442603f35f87 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 11:09:03 -0500 Subject: [PATCH 026/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 52562ac..bef1528 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -142,6 +142,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.1.29-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jun 2 2012 Alexander Boström - 1.1.29-15 - Really create the home directory. From ffefab6b7a507933483f844153bd4a82f7e9081a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:37:01 -0600 Subject: [PATCH 027/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index bef1528..0f9b550 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -142,6 +142,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.1.29-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.1.29-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5867d557067ae5e1fe4e5353f03fe04fa438b5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 23 Feb 2013 18:08:59 +0100 Subject: [PATCH 028/107] Add patch to build with boost 1.53 (rhbz #913877) --- anyterm-1.1.29-boostclassic.patch | 58 +++++++++++++++++++++++++++++++ anyterm.spec | 10 +++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 anyterm-1.1.29-boostclassic.patch diff --git a/anyterm-1.1.29-boostclassic.patch b/anyterm-1.1.29-boostclassic.patch new file mode 100644 index 0000000..22eb1ad --- /dev/null +++ b/anyterm-1.1.29-boostclassic.patch @@ -0,0 +1,58 @@ +diff -ur anyterm-1.1.29/libpbe/src/parse_http_request.cc anyterm-1.1.29.boostclassic/libpbe/src/parse_http_request.cc +--- anyterm-1.1.29/libpbe/src/parse_http_request.cc 2008-11-09 15:18:30.000000000 +0100 ++++ anyterm-1.1.29.boostclassic/libpbe/src/parse_http_request.cc 2013-02-23 18:00:30.599265737 +0100 +@@ -18,11 +18,11 @@ + + #include "parse_http_request.hh" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +@@ -31,7 +31,7 @@ + + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + namespace pbe { +diff -ur anyterm-1.1.29/libpbe/src/URI.cc anyterm-1.1.29.boostclassic/libpbe/src/URI.cc +--- anyterm-1.1.29/libpbe/src/URI.cc 2008-11-09 15:16:16.000000000 +0100 ++++ anyterm-1.1.29.boostclassic/libpbe/src/URI.cc 2013-02-23 18:00:22.860322952 +0100 +@@ -18,11 +18,11 @@ + + #include "URI.hh" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +@@ -30,7 +30,7 @@ + #include + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + namespace pbe { diff --git a/anyterm.spec b/anyterm.spec index 0f9b550..7c2e7fc 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -18,6 +18,9 @@ Patch0: anyterm-change-url-prefix.patch # http://anyterm.org/forums/viewtopic.php?id=581 Patch1: anyterm-libpbe-fix.patch +# boost 1.53 compatibility +Patch2: anyterm-1.1.29-boostclassic.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: boost-devel BuildRequires: zlib-devel @@ -52,6 +55,8 @@ The httpd configuration necessary to proxy anyterm. %patch0 -p0 cd libpbe/ %patch1 -p0 +cd .. +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -142,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Feb 23 2013 Alexander Boström - 1.1.29-18 +- Add patch to build with boost 1.53 (rhbz #913877) + * Wed Feb 13 2013 Fedora Release Engineering - 1.1.29-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 757c3cfc6f37bbc9903983765f0f20eb493e2f3a Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 13:37:33 +0200 Subject: [PATCH 029/107] Rebuild for boost 1.54.0 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 7c2e7fc..e3af382 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -147,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jul 30 2013 Petr Machata - 1.1.29-19 +- Rebuild for boost 1.54.0 + * Sat Feb 23 2013 Alexander Boström - 1.1.29-18 - Add patch to build with boost 1.53 (rhbz #913877) From 214e3799412a00e9a94be33e00bfff770bab56be Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:55:32 -0500 Subject: [PATCH 030/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index e3af382..0979242 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -147,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.29-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Petr Machata - 1.1.29-19 - Rebuild for boost 1.54.0 From 2d37fc02dd1a8cf7aea5fced63a9c83628fec0c9 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 22 May 2014 21:53:36 +0200 Subject: [PATCH 031/107] Rebuild for boost 1.55.0 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 0979242..e9348ce 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -147,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu May 22 2014 Petr Machata - 1.1.29-21 +- Rebuild for boost 1.55.0 + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.29-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8d572aabe5b4c52a46e1ce789b193b62eebfc392 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:49:43 -0500 Subject: [PATCH 032/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index e9348ce..c5ece96 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -147,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.29-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 22 2014 Petr Machata - 1.1.29-21 - Rebuild for boost 1.55.0 From f5731d9c420b5f3265c02f219e3d3fdc9668fe67 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 30 Jun 2014 14:53:46 +0100 Subject: [PATCH 033/107] No prelink on aarch64 ppc64le, Cleanup spec and update systemd scriptlets --- anyterm.spec | 70 +++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index c5ece96..d638625 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -21,16 +21,15 @@ Patch1: anyterm-libpbe-fix.patch # boost 1.53 compatibility Patch2: anyterm-1.1.29-boostclassic.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: boost-devel BuildRequires: zlib-devel +%ifnarch aarch64 ppc64le BuildRequires: prelink -BuildRequires: systemd-units -Requires(pre): shadow-utils -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-sysv +%endif +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %package httpd @@ -61,35 +60,32 @@ cd .. %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -%{__make} %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -%{__gzip} anytermd.1 +make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" +gzip anytermd.1 +%ifnarch aarch64 ppc64le execstack -c anytermd +%endif %install -%{__rm} -rf %{buildroot} +install -Dp -m0755 anytermd %{buildroot}%{_sbindir}/anytermd +install -Dp -m0644 anytermd.1.gz %{buildroot}%{_mandir}/man1/anytermd.1.gz +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd +install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf +install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service -%{__install} -Dp -m0755 anytermd %{buildroot}%{_sbindir}/anytermd -%{__install} -Dp -m0644 anytermd.1.gz %{buildroot}%{_mandir}/man1/anytermd.1.gz -%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd -%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf -%{__install} -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service - -%{__mkdir} -p %{buildroot}%{_datadir}/anyterm/ +mkdir -p %{buildroot}%{_datadir}/anyterm/ for f in browser/*.{html,css,js,png,gif}; do - %{__install} -m644 "$f" %{buildroot}%{_datadir}/anyterm/ + install -m644 "$f" %{buildroot}%{_datadir}/anyterm/ done # Create a home directory for the user. -%{__mkdir} -p -m755 %{buildroot}%{_localstatedir}/run/%{name} +mkdir -p -m755 %{buildroot}%{_localstatedir}/run/%{name} mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d cat < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf d %{_localstatedir}/run/%{name} 0755 root %{name} EOF -%clean -rm -rf %{buildroot} - %pre # create anyterm group / user getent group %{name} >/dev/null 2>&1 || \ @@ -107,32 +103,15 @@ fi exit 0 %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post anyterm.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable anyterm.service > /dev/null 2>&1 || : - /bin/systemctl stop anyterm.service > /dev/null 2>&1 || : -fi +%systemd_preun anyterm.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart anyterm.service >/dev/null 2>&1 || : -fi - -%triggerun -- anyterm < 1.1.29-12 -/usr/bin/systemd-sysv-convert --save anyterm >/dev/null 2>&1 ||: -/sbin/chkconfig --del anyterm >/dev/null 2>&1 || : -/bin/systemctl try-restart anyterm.service >/dev/null 2>&1 || : +%systemd_postun_with_restart anyterm.service %files -%defattr(-,root,root,-) %{_sbindir}/anytermd %{_libexecdir}/anyterm/ %{_mandir}/man1/anytermd.1.gz @@ -143,10 +122,13 @@ fi %doc LICENSE %files httpd -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Jun 30 2014 Peter Robinson 1.1.29-23 +- No prelink on aarch64 ppc64le +- Cleanup spec and update systemd scriptlets + * Sat Jun 07 2014 Fedora Release Engineering - 1.1.29-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e7a4191beb0a7533837f6592e7f4261e9861f460 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:39:58 +0000 Subject: [PATCH 034/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d638625..c02310e 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.1.29-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Mon Jun 30 2014 Peter Robinson 1.1.29-23 - No prelink on aarch64 ppc64le - Cleanup spec and update systemd scriptlets From cbf177c09974f59ca520fce8801bece540065b50 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 01:14:25 +0100 Subject: [PATCH 035/107] Rebuild for boost 1.57.0 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index c02310e..bb34c05 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jan 27 2015 Petr Machata - 1.1.29-25 +- Rebuild for boost 1.57.0 + * Fri Aug 15 2014 Fedora Release Engineering - 1.1.29-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From d41ef1da89a10d6519161c1c4d619fbab6094058 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:32:26 +0200 Subject: [PATCH 036/107] Rebuilt for GCC 5 C++11 ABI change --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index bb34c05..c6597a9 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat May 02 2015 Kalev Lember - 1.1.29-26 +- Rebuilt for GCC 5 C++11 ABI change + * Tue Jan 27 2015 Petr Machata - 1.1.29-25 - Rebuild for boost 1.57.0 From 6b8ac7c7e33391004ecf07eed891cf81d340f1bf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:59:26 +0000 Subject: [PATCH 037/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index c6597a9..d4deada 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.1.29-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.1.29-26 - Rebuilt for GCC 5 C++11 ABI change From 281d24685751d2b53dc869efa520f5c64b1de3ee Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 18:04:17 +0200 Subject: [PATCH 038/107] rebuild for Boost 1.58 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d4deada..2d9a719 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 27%{?dist} +Release: 28%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 22 2015 David Tardon - 1.1.29-28 +- rebuild for Boost 1.58 + * Tue Jun 16 2015 Fedora Release Engineering - 1.1.29-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From a502c8df0e0ef35479029e3dc4b1fe56b751b7f1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 11:57:30 -0500 Subject: [PATCH 039/107] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 2d9a719..5532aac 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -125,6 +125,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1.1.29-29 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1.1.29-28 - rebuild for Boost 1.58 From df3ab72c895f704fb768c6225109062a1111230f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 1 Aug 2015 10:21:53 +0200 Subject: [PATCH 040/107] remove prelink buildreq --- anyterm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 5532aac..73995b9 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -23,9 +23,6 @@ Patch2: anyterm-1.1.29-boostclassic.patch BuildRequires: boost-devel BuildRequires: zlib-devel -%ifnarch aarch64 ppc64le -BuildRequires: prelink -%endif BuildRequires: systemd Requires(post): systemd Requires(preun): systemd @@ -125,6 +122,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Aug 01 2015 Alexander Boström - 1.1.29-30 +- remove prelink buildreq + * Wed Jul 29 2015 Fedora Release Engineering - 1.1.29-29 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From db832e7135d3cc5e24bcaf8df4aa2f2746c4a44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 1 Aug 2015 10:28:41 +0200 Subject: [PATCH 041/107] fix build without prelink --- anyterm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 73995b9..0dedfef 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 30%{?dist} +Release: 31%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -59,9 +59,6 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" gzip anytermd.1 -%ifnarch aarch64 ppc64le -execstack -c anytermd -%endif %install install -Dp -m0755 anytermd %{buildroot}%{_sbindir}/anytermd @@ -122,6 +119,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Aug 01 2015 Alexander Boström - 1.1.29-31 +- fix build without prelink + * Sat Aug 01 2015 Alexander Boström - 1.1.29-30 - remove prelink buildreq From 2efff3ead641dfa52eac7962ba1313cd26b9aea9 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 5 Aug 2015 19:42:45 +0100 Subject: [PATCH 042/107] Rebuilt for Boost 1.58 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 0dedfef..75ef201 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 31%{?dist} +Release: 32%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -119,6 +119,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Aug 05 2015 Jonathan Wakely 1.1.29-32 +- Rebuilt for Boost 1.58 + * Sat Aug 01 2015 Alexander Boström - 1.1.29-31 - fix build without prelink From 29a049b590c6aa1f9f932099085313747889662e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 21:17:23 +0100 Subject: [PATCH 043/107] Rebuilt for Boost 1.59 --- anyterm-boost_system.patch | 11 +++++++++++ anyterm.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 anyterm-boost_system.patch diff --git a/anyterm-boost_system.patch b/anyterm-boost_system.patch new file mode 100644 index 0000000..77ce6d6 --- /dev/null +++ b/anyterm-boost_system.patch @@ -0,0 +1,11 @@ +--- common.mk~ 2015-08-28 17:05:37.271247678 +0100 ++++ common.mk 2015-08-28 17:05:15.254181357 +0100 +@@ -49,7 +49,7 @@ + CC_COMPILE_FLAGS=$(COMPILE_FLAGS) + + LINK_FLAGS=${GCC_FLAGS} ${DEBUG_FLAGS} \ +- -lutil ++ -lutil -lboost_system + + ifeq (${UNAME_S},OpenBSD) + LINK_FLAGS+=-liconv diff --git a/anyterm.spec b/anyterm.spec index 75ef201..3763d00 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 32%{?dist} +Release: 33%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -21,6 +21,9 @@ Patch1: anyterm-libpbe-fix.patch # boost 1.53 compatibility Patch2: anyterm-1.1.29-boostclassic.patch +# boost 1.59 compatibility +Patch3: anyterm-boost_system.patch + BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: systemd @@ -53,6 +56,7 @@ cd libpbe/ %patch1 -p0 cd .. %patch2 -p1 +%patch3 -p0 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -119,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Aug 28 2015 Jonathan Wakely 1.1.29-33 +- Patched and rebuilt for Boost 1.59 + * Wed Aug 05 2015 Jonathan Wakely 1.1.29-32 - Rebuilt for Boost 1.58 From 8a282433c719cc3cb8eb4826fe40f352a79bff67 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 14 Jan 2016 02:03:32 +0000 Subject: [PATCH 044/107] Rebuilt for Boost 1.60 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 3763d00..503e971 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 33%{?dist} +Release: 34%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jan 14 2016 Jonathan Wakely - 1.1.29-34 +- Rebuilt for Boost 1.60 + * Fri Aug 28 2015 Jonathan Wakely 1.1.29-33 - Patched and rebuilt for Boost 1.59 From f90c86fb37095c798cc611ca33a1ffeeee0c347f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:15:01 +0000 Subject: [PATCH 045/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 503e971..5e48ad0 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 34%{?dist} +Release: 35%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.1.29-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Jonathan Wakely - 1.1.29-34 - Rebuilt for Boost 1.60 From e2419ed1349de6e18a4e17dc1f1151b92f7f2627 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 23 Feb 2016 15:49:18 -0600 Subject: [PATCH 046/107] Specify C++98 usage (#1307317) --- anyterm.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 5e48ad0..a4c584b 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 35%{?dist} +Release: 36%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -60,8 +60,8 @@ cd .. %build export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98" +make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" OPTIMISE_FLAGS="$CXXFLAGS" gzip anytermd.1 %install @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Feb 23 2016 Yaakov Selkowitz - 1.1.29-36 +- Specify C++98 usage (#1307317) + * Wed Feb 03 2016 Fedora Release Engineering - 1.1.29-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 22dde4aef56caa44f4ff70b90380ea22889539a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:02:10 +0000 Subject: [PATCH 047/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index a4c584b..b17d33b 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 36%{?dist} +Release: 37%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.29-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Feb 23 2016 Yaakov Selkowitz - 1.1.29-36 - Specify C++98 usage (#1307317) From c376fb0eda8bbdc06bc2a37d362b1e26b349e949 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 3 Jul 2017 16:26:27 +0100 Subject: [PATCH 048/107] Rebuilt for Boost 1.64 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index b17d33b..19fbf8f 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 37%{?dist} +Release: 38%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Jul 03 2017 Jonathan Wakely - 1.1.29-38 +- Rebuilt for Boost 1.64 + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.29-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ff3264e8ce0890143f8a6c04d1f43bf175999621 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 19 Jul 2017 16:20:07 +0100 Subject: [PATCH 049/107] Rebuilt for s390x binutils bug --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 19fbf8f..4915cb1 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 38%{?dist} +Release: 39%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 19 2017 Jonathan Wakely - 1.1.29-39 +- Rebuilt for s390x binutils bug + * Mon Jul 03 2017 Jonathan Wakely - 1.1.29-38 - Rebuilt for Boost 1.64 From e5c5d02299398cd128db18cf97d39ebdaf7f2519 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:56:30 +0000 Subject: [PATCH 050/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 4915cb1..714b252 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 39%{?dist} +Release: 40%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.29-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 19 2017 Jonathan Wakely - 1.1.29-39 - Rebuilt for s390x binutils bug From e104e22acfe4c50aab456a9f2b683506a742e4ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:37:04 +0000 Subject: [PATCH 051/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 714b252..f147e2f 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 40%{?dist} +Release: 41%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.1.29-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.29-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 60d0371368a1dcb30acf1a481c24c600baffe249 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 00:33:01 +0000 Subject: [PATCH 052/107] Rebuilt for Boost 1.66 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index f147e2f..7991b68 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 41%{?dist} +Release: 42%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jan 23 2018 Jonathan Wakely - 1.1.29-42 +- Rebuilt for Boost 1.66 + * Wed Aug 02 2017 Fedora Release Engineering - 1.1.29-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cf38b24b58bc3221e5ce5e52c3b988e157f44880 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:23:25 +0000 Subject: [PATCH 053/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 7991b68..dd42c5e 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 42%{?dist} +Release: 43%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.29-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Jonathan Wakely - 1.1.29-42 - Rebuilt for Boost 1.66 From a5793271860cfd5baa19bbe30b0738dc1d2bea76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:16:58 +0000 Subject: [PATCH 054/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index dd42c5e..7ac543a 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 43%{?dist} +Release: 44%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -123,6 +123,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.29-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.29-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e4d9501f14162e36bdd54b478b25a51d028dffc9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 055/107] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- anyterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anyterm.spec b/anyterm.spec index 7ac543a..00f7f5b 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -24,6 +24,7 @@ Patch2: anyterm-1.1.29-boostclassic.patch # boost 1.59 compatibility Patch3: anyterm-boost_system.patch +BuildRequires: gcc-c++ BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: systemd From bb7744af64fe0f048d7d08ab6e0d5512af8176e4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Jan 2019 21:09:43 +0000 Subject: [PATCH 056/107] Rebuilt for Boost 1.69 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 00f7f5b..eba4e94 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 44%{?dist} +Release: 45%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -124,6 +124,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jan 24 2019 Jonathan Wakely - 1.1.29-45 +- Rebuilt for Boost 1.69 + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.29-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ef8760f48ebdec538622355ff965d6f2257af8ad Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 057/107] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- anyterm.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index eba4e94..6a84d07 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -3,7 +3,6 @@ Version: 1.1.29 Release: 45%{?dist} Summary: A web-based terminal emulator -Group: Applications/Internet License: GPLv2+ URL: http://anyterm.org @@ -35,7 +34,6 @@ Requires(postun): systemd %package httpd Summary: Httpd proxy configuration for anyterm -Group: Applications/Internet License: GPLv2+ Requires: %{name} = %{version}-%{release} Requires: httpd From 8247caa3078e6f2082d72b9f15ad23f7f6c67bdb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:24:19 +0000 Subject: [PATCH 058/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 6a84d07..514cec0 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 45%{?dist} +Release: 46%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -122,6 +122,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.29-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 24 2019 Jonathan Wakely - 1.1.29-45 - Rebuilt for Boost 1.69 From 8c2e6c33ce90f61c0dda0ab7af2dfb568d91319b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:00:01 +0000 Subject: [PATCH 059/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 514cec0..a8ed0f4 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 46%{?dist} +Release: 47%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -122,6 +122,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.29-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.29-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d4c69fcda28b03ac8081bb95e039f1c5abb05aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sun, 17 Nov 2019 15:56:19 +0100 Subject: [PATCH 060/107] update to anyterm-1.2.3 --- .gitignore | 2 +- anyterm.spec | 29 +++++++++++------------------ sources | 2 +- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index d74533c..f8cbe30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -anyterm-1.1.29.tbz2 +/anyterm-1.2.3.tar.xz diff --git a/anyterm.spec b/anyterm.spec index a8ed0f4..459d379 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,12 +1,16 @@ Name: anyterm -Version: 1.1.29 -Release: 47%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: A web-based terminal emulator License: GPLv2+ URL: http://anyterm.org -Source0: http://anyterm.org/download/anyterm-1.1.29.tbz2 +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# svn export http://svn.anyterm.org/anyterm/tags/releases/1.2/1.2.3 anyterm-1.2.3 +# tar -jcf anyterm-1.2.3.tar.xz anyterm-1.2.3 +Source0: anyterm-1.2.3.tar.xz Source1: anyterm-cmd Source4: anyterm.conf Source5: anyterm.service @@ -14,15 +18,6 @@ Source5: anyterm.service # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch -# http://anyterm.org/forums/viewtopic.php?id=581 -Patch1: anyterm-libpbe-fix.patch - -# boost 1.53 compatibility -Patch2: anyterm-1.1.29-boostclassic.patch - -# boost 1.59 compatibility -Patch3: anyterm-boost_system.patch - BuildRequires: gcc-c++ BuildRequires: boost-devel BuildRequires: zlib-devel @@ -51,15 +46,10 @@ The httpd configuration necessary to proxy anyterm. %prep %setup -q %patch0 -p0 -cd libpbe/ -%patch1 -p0 -cd .. -%patch2 -p1 -%patch3 -p0 %build export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98" +export CXXFLAGS="$RPM_OPT_FLAGS -std=c++17" make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" OPTIMISE_FLAGS="$CXXFLAGS" gzip anytermd.1 @@ -122,6 +112,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sun Nov 17 2019 Alexander Boström - 1.2.3-1 +- upgrade to 1.2.3 + * Wed Jul 24 2019 Fedora Release Engineering - 1.1.29-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3e6c646..5a4a85b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84fe7f3b4f516815901d1f545e79f13d anyterm-1.1.29.tbz2 +SHA512 (anyterm-1.2.3.tar.xz) = 640e6993d6f1171a1f52e2a253e5791ed21b07dbfabc405443d516e92eef6cfc9248ce09f2f882d099429311821bd908dec40b06db5582c7277e8ca80ad66501 From 3898713623c71a595e0c0a94385377fdbc49f891 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:41:01 +0000 Subject: [PATCH 061/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 459d379..f8b1416 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -112,6 +112,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Nov 17 2019 Alexander Boström - 1.2.3-1 - upgrade to 1.2.3 From c8c39da8538745e7dd74c72ad9c511217d576558 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 28 May 2020 19:27:56 +0100 Subject: [PATCH 062/107] Rebuilt for Boost 1.73 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index f8b1416..8471e81 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -112,6 +112,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu May 28 2020 Jonathan Wakely - 1.2.3-3 +- Rebuilt for Boost 1.73 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0a70f5a521464a4ecf2d4d79cf67f77b5e90b6bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:08:07 +0000 Subject: [PATCH 063/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 8471e81..d84d356 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -112,6 +112,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu May 28 2020 Jonathan Wakely - 1.2.3-3 - Rebuilt for Boost 1.73 From 7c8bf64275446a93b362ed8b2479753a5d0bc267 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:00:36 +0000 Subject: [PATCH 064/107] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d84d356..ed26af7 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -112,6 +112,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7ede259dbcf9085ad68988b998805c662de0f4e3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:30:59 +0000 Subject: [PATCH 065/107] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- anyterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anyterm.spec b/anyterm.spec index ed26af7..12360ac 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -22,6 +22,7 @@ BuildRequires: gcc-c++ BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: systemd +BuildRequires: make Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From eedb32ba202283507b9ca8f443f7d828933208d8 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 16:34:27 +0000 Subject: [PATCH 066/107] Rebuilt for Boost 1.75 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 12360ac..39dbc38 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1.2.3-6 +- Rebuilt for Boost 1.75 + * Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 28e893f45ef2fd599b90a94547e5900f9ecf0ceb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:11:59 +0000 Subject: [PATCH 067/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 39dbc38..30695fb 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 1.2.3-6 - Rebuilt for Boost 1.75 From 01cdb9447476f89a7afaaf4d6cd2745a65a6d1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:13 +0100 Subject: [PATCH 068/107] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- anyterm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 30695fb..d4f8b8d 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.3-8 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From fe9049c8b84c812f5388b3bbdfff03c932a66571 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:44:53 +0000 Subject: [PATCH 069/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 84b821eb514b166ad61e4728bed03245ce237909 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:40:49 +0000 Subject: [PATCH 070/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d4f8b8d..885e1b3 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.3-8 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 9fd03393f616c665827dd51658b89cdf42ac0c53 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Aug 2021 22:07:21 +0100 Subject: [PATCH 071/107] Rebuilt for Boost 1.76 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 885e1b3..d24b166 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Aug 06 2021 Jonathan Wakely - 1.2.3-10 +- Rebuilt for Boost 1.76 + * Wed Jul 21 2021 Fedora Release Engineering - 1.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3c32487d39b591c2c9194991b25d28b1233d23f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:22:41 +0000 Subject: [PATCH 072/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d24b166..d41f3da 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jonathan Wakely - 1.2.3-10 - Rebuilt for Boost 1.76 From d5329549cd19701868a3b6eed622df6cc3972389 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:37:27 +0200 Subject: [PATCH 073/107] Rebuilt for Boost 1.78 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d41f3da..72bc941 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed May 04 2022 Thomas Rodgers - 1.2.3-12 +- Rebuilt for Boost 1.78 + * Wed Jan 19 2022 Fedora Release Engineering - 1.2.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 44d81a8ea162c8ddc564b722d8411c693dad5ef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:56:58 +0000 Subject: [PATCH 074/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 72bc941..cc64134 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 04 2022 Thomas Rodgers - 1.2.3-12 - Rebuilt for Boost 1.78 From 67376203205568eaf3c1f87472277f88b4959260 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:52:00 +0000 Subject: [PATCH 075/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index cc64134..e5b9590 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.2.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.2.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 957f640afd4749f2ddc1c97de3eb5561e5889c64 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:46:15 +0000 Subject: [PATCH 076/107] Rebuilt for Boost 1.81 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index e5b9590..2ef9a0a 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Feb 20 2023 Jonathan Wakely - 1.2.3-15 +- Rebuilt for Boost 1.81 + * Wed Jan 18 2023 Fedora Release Engineering - 1.2.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6c54e0c5ac457220595cab16043ca65ac97db852 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:26:01 +0000 Subject: [PATCH 077/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 2ef9a0a..1de1fc1 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 20 2023 Jonathan Wakely - 1.2.3-15 - Rebuilt for Boost 1.81 From 2ae423ebb17e3756563117c9b04c6153c4143bd3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 19:32:22 +0000 Subject: [PATCH 078/107] Rebuilt for Boost 1.83 --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 1de1fc1..d96a4c6 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jan 17 2024 Jonathan Wakely - 1.2.3-17 +- Rebuilt for Boost 1.83 + * Wed Jul 19 2023 Fedora Release Engineering - 1.2.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b16eb5a51a02216bfa9ab6d46a16feafc9457b33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:08:47 +0000 Subject: [PATCH 079/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index d96a4c6..dc40ea2 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 17 2024 Jonathan Wakely - 1.2.3-17 - Rebuilt for Boost 1.83 From b51c65b0ac6529dda8a50c3a68acdb057580e6df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:11:25 +0000 Subject: [PATCH 080/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index dc40ea2..a86edfb 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.2.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.2.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a8dc34fcc422d966fb31064de30d2238c80720b8 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 081/107] Eliminate use of obsolete %patchN syntax (#2283636) --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index a86edfb..82fbb53 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -46,7 +46,7 @@ The httpd configuration necessary to proxy anyterm. %prep %setup -q -%patch0 -p0 +%patch -P0 -p0 %build export CFLAGS="$RPM_OPT_FLAGS" From 5064f6c783f1cf3baa404b3755cd3c0039ccc167 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:08:36 +0000 Subject: [PATCH 082/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 82fbb53..59c7bdc 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A web-based terminal emulator License: GPLv2+ @@ -113,6 +113,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.2.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.2.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af03fbb1dc7c70459fbceb6f70625492e49124bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:56:52 +0200 Subject: [PATCH 083/107] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- anyterm.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 59c7bdc..b5b29cd 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,9 +1,10 @@ Name: anyterm Version: 1.2.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A web-based terminal emulator -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://anyterm.org # The source for this package was pulled from upstream's vcs. Use the @@ -30,7 +31,8 @@ Requires(postun): systemd %package httpd Summary: Httpd proxy configuration for anyterm -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Requires: httpd @@ -113,6 +115,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jul 25 2024 Miroslav Suchý - 1.2.3-21 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 1.2.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b808a77247c541a25f6535febec8706f781648b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:13:00 +0000 Subject: [PATCH 084/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- anyterm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index b5b29cd..cd28759 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A web-based terminal emulator # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -115,6 +115,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 1.2.3-21 - convert license to SPDX From 1d6a3a530f1245e2780fd772e72f92267d4f0ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:18 +0100 Subject: [PATCH 085/107] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- anyterm.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index cd28759..29005ed 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A web-based terminal emulator # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -50,6 +50,11 @@ The httpd configuration necessary to proxy anyterm. %setup -q %patch -P0 -p0 +# Create a sysusers.d config file +cat >anyterm.sysusers.conf < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf d %{_localstatedir}/run/%{name} 0755 root %{name} EOF +install -m0644 -D anyterm.sysusers.conf %{buildroot}%{_sysusersdir}/anyterm.conf + %pre -# create anyterm group / user -getent group %{name} >/dev/null 2>&1 || \ - groupadd -r %{name} -getent passwd %{name} >/dev/null 2>&1 || \ - useradd -r -l -g %{name} -s /sbin/nologin \ - -d %{_localstatedir}/run/%{name} -c "Anyterm service" %{name} if [[ ! -d %{_localstatedir}/run/%{name} ]]; then mkdir -m755 %{_localstatedir}/run/%{name} chown %{name}:%{name} %{_localstatedir}/run/%{name} @@ -110,11 +111,15 @@ exit 0 %ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name} %{_sysconfdir}/tmpfiles.d/%{name}.conf %doc LICENSE +%{_sysusersdir}/anyterm.conf %files httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.2.3-23 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 1.2.3-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e80d9c92565d908fcca4cbe04235105a30612a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 16:42:31 +0200 Subject: [PATCH 086/107] Convert to %autorelease and %autochangelog [skip changelog] --- anyterm.spec | 226 +-------------------------------------------------- changelog | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+), 224 deletions(-) create mode 100644 changelog diff --git a/anyterm.spec b/anyterm.spec index 29005ed..5d4c045 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.2.3 -Release: 23%{?dist} +Release: %autorelease Summary: A web-based terminal emulator # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -117,226 +117,4 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.2.3-23 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Thu Jan 16 2025 Fedora Release Engineering - 1.2.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 1.2.3-21 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.2.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.2.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.2.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 17 2024 Jonathan Wakely - 1.2.3-17 -- Rebuilt for Boost 1.83 - -* Wed Jul 19 2023 Fedora Release Engineering - 1.2.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Feb 20 2023 Jonathan Wakely - 1.2.3-15 -- Rebuilt for Boost 1.81 - -* Wed Jan 18 2023 Fedora Release Engineering - 1.2.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.2.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed May 04 2022 Thomas Rodgers - 1.2.3-12 -- Rebuilt for Boost 1.78 - -* Wed Jan 19 2022 Fedora Release Engineering - 1.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Aug 06 2021 Jonathan Wakely - 1.2.3-10 -- Rebuilt for Boost 1.76 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.3-8 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 1.2.3-6 -- Rebuilt for Boost 1.75 - -* Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Jonathan Wakely - 1.2.3-3 -- Rebuilt for Boost 1.73 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Nov 17 2019 Alexander Boström - 1.2.3-1 -- upgrade to 1.2.3 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.1.29-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.1.29-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 24 2019 Jonathan Wakely - 1.1.29-45 -- Rebuilt for Boost 1.69 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.1.29-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.29-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 1.1.29-42 -- Rebuilt for Boost 1.66 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.1.29-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.29-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Jonathan Wakely - 1.1.29-39 -- Rebuilt for s390x binutils bug - -* Mon Jul 03 2017 Jonathan Wakely - 1.1.29-38 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.29-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Feb 23 2016 Yaakov Selkowitz - 1.1.29-36 -- Specify C++98 usage (#1307317) - -* Wed Feb 03 2016 Fedora Release Engineering - 1.1.29-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 14 2016 Jonathan Wakely - 1.1.29-34 -- Rebuilt for Boost 1.60 - -* Fri Aug 28 2015 Jonathan Wakely 1.1.29-33 -- Patched and rebuilt for Boost 1.59 - -* Wed Aug 05 2015 Jonathan Wakely 1.1.29-32 -- Rebuilt for Boost 1.58 - -* Sat Aug 01 2015 Alexander Boström - 1.1.29-31 -- fix build without prelink - -* Sat Aug 01 2015 Alexander Boström - 1.1.29-30 -- remove prelink buildreq - -* Wed Jul 29 2015 Fedora Release Engineering - 1.1.29-29 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.1.29-28 -- rebuild for Boost 1.58 - -* Tue Jun 16 2015 Fedora Release Engineering - 1.1.29-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.1.29-26 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Jan 27 2015 Petr Machata - 1.1.29-25 -- Rebuild for boost 1.57.0 - -* Fri Aug 15 2014 Fedora Release Engineering - 1.1.29-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jun 30 2014 Peter Robinson 1.1.29-23 -- No prelink on aarch64 ppc64le -- Cleanup spec and update systemd scriptlets - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1.29-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Petr Machata - 1.1.29-21 -- Rebuild for boost 1.55.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1.29-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 1.1.29-19 -- Rebuild for boost 1.54.0 - -* Sat Feb 23 2013 Alexander Boström - 1.1.29-18 -- Add patch to build with boost 1.53 (rhbz #913877) - -* Wed Feb 13 2013 Fedora Release Engineering - 1.1.29-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.1.29-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 2 2012 Alexander Boström - 1.1.29-15 -- Really create the home directory. - -* Fri Jun 1 2012 Alexander Boström - 1.1.29-14 -- Actually create the home directory on first install. - -* Fri Jun 1 2012 Alexander Boström - 1.1.29-13 -- Fix spec file typo. -- Create a home directory for the Anyterm user. - -* Tue May 22 2012 Alexander Boström - 1.1.29-12 -- Remove SysV script, add systemd service file. -- Fix anyterm-cmd. - -* Tue Feb 28 2012 Fedora Release Engineering - 1.1.29-11 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 Fedora Release Engineering - 1.1.29-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1.29-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 15 2009 - 1.1.29-8 -- correct anyterm dependency for anyterm-httpd subpkg -- removed useradd/group add stdout redirection -- def attr for anyterm-httpd subpkg -- slight rewording and other trivial tasks - -* Tue Jul 14 2009 - 1.1.29-7 -- removed useradd/group add stderr redirection -- used all macros where i could -- create httpd subpackage for anyterm/httpd integration - -* Mon Jul 13 2009 - 1.1.29-6 -- fixed location of %%doc macro, and resolved other - macro issues -- moved anyterm-cmd from bindir to libexecdir/anyterm - -* Thu Jul 09 2009 - 1.1.29-5 -- added CFLAGS / CXXFLAGS to pick up RPM_OPT_FLAGS - -* Tue Jul 07 2009 - 1.1.29-4 -- removed pbuild -- removed executable stack (requires prelink/execstack) - -* Thu Apr 09 2009 - 1.1.29-3 -- updated spec / init based on rpmlint output - -* Wed Apr 08 2009 - 1.1.29-2 -- Serve static content via apache -- Use 1.1.29 release and newly added patches - -* Mon Mar 16 2009 - 1.1.29-1 -- Initial checkout and build. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..65bed52 --- /dev/null +++ b/changelog @@ -0,0 +1,223 @@ +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.2.3-23 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 1.2.3-21 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 1.2.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.2.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 17 2024 Jonathan Wakely - 1.2.3-17 +- Rebuilt for Boost 1.83 + +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 20 2023 Jonathan Wakely - 1.2.3-15 +- Rebuilt for Boost 1.81 + +* Wed Jan 18 2023 Fedora Release Engineering - 1.2.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed May 04 2022 Thomas Rodgers - 1.2.3-12 +- Rebuilt for Boost 1.78 + +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Aug 06 2021 Jonathan Wakely - 1.2.3-10 +- Rebuilt for Boost 1.76 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.3-8 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 22 2021 Jonathan Wakely - 1.2.3-6 +- Rebuilt for Boost 1.75 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Jonathan Wakely - 1.2.3-3 +- Rebuilt for Boost 1.73 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Nov 17 2019 Alexander Boström - 1.2.3-1 +- upgrade to 1.2.3 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.29-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.29-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 24 2019 Jonathan Wakely - 1.1.29-45 +- Rebuilt for Boost 1.69 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.29-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.29-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 23 2018 Jonathan Wakely - 1.1.29-42 +- Rebuilt for Boost 1.66 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.1.29-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.29-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Jonathan Wakely - 1.1.29-39 +- Rebuilt for s390x binutils bug + +* Mon Jul 03 2017 Jonathan Wakely - 1.1.29-38 +- Rebuilt for Boost 1.64 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.29-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Feb 23 2016 Yaakov Selkowitz - 1.1.29-36 +- Specify C++98 usage (#1307317) + +* Wed Feb 03 2016 Fedora Release Engineering - 1.1.29-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 14 2016 Jonathan Wakely - 1.1.29-34 +- Rebuilt for Boost 1.60 + +* Fri Aug 28 2015 Jonathan Wakely 1.1.29-33 +- Patched and rebuilt for Boost 1.59 + +* Wed Aug 05 2015 Jonathan Wakely 1.1.29-32 +- Rebuilt for Boost 1.58 + +* Sat Aug 01 2015 Alexander Boström - 1.1.29-31 +- fix build without prelink + +* Sat Aug 01 2015 Alexander Boström - 1.1.29-30 +- remove prelink buildreq + +* Wed Jul 29 2015 Fedora Release Engineering - 1.1.29-29 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 1.1.29-28 +- rebuild for Boost 1.58 + +* Tue Jun 16 2015 Fedora Release Engineering - 1.1.29-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.1.29-26 +- Rebuilt for GCC 5 C++11 ABI change + +* Tue Jan 27 2015 Petr Machata - 1.1.29-25 +- Rebuild for boost 1.57.0 + +* Fri Aug 15 2014 Fedora Release Engineering - 1.1.29-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jun 30 2014 Peter Robinson 1.1.29-23 +- No prelink on aarch64 ppc64le +- Cleanup spec and update systemd scriptlets + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.29-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Petr Machata - 1.1.29-21 +- Rebuild for boost 1.55.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.29-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Petr Machata - 1.1.29-19 +- Rebuild for boost 1.54.0 + +* Sat Feb 23 2013 Alexander Boström - 1.1.29-18 +- Add patch to build with boost 1.53 (rhbz #913877) + +* Wed Feb 13 2013 Fedora Release Engineering - 1.1.29-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.1.29-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jun 2 2012 Alexander Boström - 1.1.29-15 +- Really create the home directory. + +* Fri Jun 1 2012 Alexander Boström - 1.1.29-14 +- Actually create the home directory on first install. + +* Fri Jun 1 2012 Alexander Boström - 1.1.29-13 +- Fix spec file typo. +- Create a home directory for the Anyterm user. + +* Tue May 22 2012 Alexander Boström - 1.1.29-12 +- Remove SysV script, add systemd service file. +- Fix anyterm-cmd. + +* Tue Feb 28 2012 Fedora Release Engineering - 1.1.29-11 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.29-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.29-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 15 2009 - 1.1.29-8 +- correct anyterm dependency for anyterm-httpd subpkg +- removed useradd/group add stdout redirection +- def attr for anyterm-httpd subpkg +- slight rewording and other trivial tasks + +* Tue Jul 14 2009 - 1.1.29-7 +- removed useradd/group add stderr redirection +- used all macros where i could +- create httpd subpackage for anyterm/httpd integration + +* Mon Jul 13 2009 - 1.1.29-6 +- fixed location of %%doc macro, and resolved other + macro issues +- moved anyterm-cmd from bindir to libexecdir/anyterm + +* Thu Jul 09 2009 - 1.1.29-5 +- added CFLAGS / CXXFLAGS to pick up RPM_OPT_FLAGS + +* Tue Jul 07 2009 - 1.1.29-4 +- removed pbuild +- removed executable stack (requires prelink/execstack) + +* Thu Apr 09 2009 - 1.1.29-3 +- updated spec / init based on rpmlint output + +* Wed Apr 08 2009 - 1.1.29-2 +- Serve static content via apache +- Use 1.1.29 release and newly added patches + +* Mon Mar 16 2009 - 1.1.29-1 +- Initial checkout and build. From 452e411cb37bde7fa2c4b62ec605c5c7f11a5963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 16:48:25 +0200 Subject: [PATCH 087/107] Verified and removed license format conversion comments --- anyterm.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 5d4c045..00e7f38 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -3,7 +3,6 @@ Version: 1.2.3 Release: %autorelease Summary: A web-based terminal emulator -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://anyterm.org @@ -31,7 +30,6 @@ Requires(postun): systemd %package httpd Summary: Httpd proxy configuration for anyterm -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Requires: httpd From 61de037bba2c20e415cfd27de60672937feb97c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 16:49:15 +0200 Subject: [PATCH 088/107] Whitespace cleanup --- anyterm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 00e7f38..0bce15c 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -18,8 +18,8 @@ Source5: anyterm.service # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch -BuildRequires: gcc-c++ -BuildRequires: boost-devel +BuildRequires: gcc-c++ +BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: systemd BuildRequires: make From 0d68e0f9cc69c2aa5878c620f264e12c4b95531f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 16:57:03 +0200 Subject: [PATCH 089/107] Change /var/run to /run (fixes bug #2269930) --- anyterm.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 0bce15c..4ab8552 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -50,7 +50,7 @@ The httpd configuration necessary to proxy anyterm. # Create a sysusers.d config file cat >anyterm.sysusers.conf < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -d %{_localstatedir}/run/%{name} 0755 root %{name} +d /run/%{name} 0755 root %{name} EOF install -m0644 -D anyterm.sysusers.conf %{buildroot}%{_sysusersdir}/anyterm.conf %pre -if [[ ! -d %{_localstatedir}/run/%{name} ]]; then - mkdir -m755 %{_localstatedir}/run/%{name} - chown %{name}:%{name} %{_localstatedir}/run/%{name} +if [[ ! -d /run/%{name} ]]; then + mkdir -m755 /run/%{name} + chown %{name}:%{name} /run/%{name} fi if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then - usermod -d %{_localstatedir}/run/%{name} %{name} + usermod -d /run/%{name} %{name} fi exit 0 @@ -106,7 +106,7 @@ exit 0 %{_mandir}/man1/anytermd.1.gz %{_datadir}/anyterm/ %{_unitdir}/anyterm.service -%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name} +%ghost %attr(0755,%{name},%{name}) %dir /run/%{name} %{_sysconfdir}/tmpfiles.d/%{name}.conf %doc LICENSE %{_sysusersdir}/anyterm.conf From ba0aa0615a272d3d70ffd98db8bef7d8aed17adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 17:06:07 +0200 Subject: [PATCH 090/107] Move tmpfiles config to /usr --- anyterm.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 4ab8552..827d3eb 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -23,6 +23,7 @@ BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: systemd BuildRequires: make +BuildRequires: systemd-rpm-macros Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -73,8 +74,8 @@ done # Create a home directory for the user. mkdir -p -m755 %{buildroot}/run/%{name} -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -cat < %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +mkdir -p %{buildroot}%{_tmpfilesdir} +cat < %{buildroot}%{_tmpfilesdir}/%{name}.conf d /run/%{name} 0755 root %{name} EOF @@ -107,7 +108,7 @@ exit 0 %{_datadir}/anyterm/ %{_unitdir}/anyterm.service %ghost %attr(0755,%{name},%{name}) %dir /run/%{name} -%{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %doc LICENSE %{_sysusersdir}/anyterm.conf From a0d6ccb5cc61d3136ef5037f39645d544a0b8688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 17:40:04 +0200 Subject: [PATCH 091/107] Remove obsolete cleanup code --- anyterm.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 827d3eb..db60e81 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -87,9 +87,6 @@ if [[ ! -d /run/%{name} ]]; then mkdir -m755 /run/%{name} chown %{name}:%{name} /run/%{name} fi -if [[ $(getent passwd %{name} | cut -d: -f6) == /dev/null ]]; then - usermod -d /run/%{name} %{name} -fi exit 0 %post From b6b929a0abad71b18eb748d6d416899a466dcbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 18:57:29 +0200 Subject: [PATCH 092/107] Move sysusers conf to a source file --- anyterm.spec | 8 ++------ anyterm.sysusers.conf | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 anyterm.sysusers.conf diff --git a/anyterm.spec b/anyterm.spec index db60e81..59b7367 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -14,6 +14,7 @@ Source0: anyterm-1.2.3.tar.xz Source1: anyterm-cmd Source4: anyterm.conf Source5: anyterm.service +Source6: anyterm.sysusers.conf # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch @@ -49,11 +50,6 @@ The httpd configuration necessary to proxy anyterm. %setup -q %patch -P0 -p0 -# Create a sysusers.d config file -cat >anyterm.sysusers.conf < %{buildroot}%{_tmpfilesdir}/%{name}.conf d /run/%{name} 0755 root %{name} EOF -install -m0644 -D anyterm.sysusers.conf %{buildroot}%{_sysusersdir}/anyterm.conf +install -m0644 -D %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf %pre diff --git a/anyterm.sysusers.conf b/anyterm.sysusers.conf new file mode 100644 index 0000000..c107e4c --- /dev/null +++ b/anyterm.sysusers.conf @@ -0,0 +1 @@ +u anyterm - 'Anyterm service' /run/anyterm - From 84035cb85f240c33f383a574d089276a589723cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:16:51 +0200 Subject: [PATCH 093/107] Use sysusers scriptlet --- anyterm.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 59b7367..2be2e41 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -28,6 +28,7 @@ BuildRequires: systemd-rpm-macros Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%{?sysusers_requires_compat} %package httpd @@ -79,11 +80,7 @@ install -m0644 -D %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf %pre -if [[ ! -d /run/%{name} ]]; then - mkdir -m755 /run/%{name} - chown %{name}:%{name} /run/%{name} -fi -exit 0 +%sysusers_create_compat %{SOURCE6} %post %systemd_post anyterm.service From dae44c450ac894a57ea94f199e2ce2fc8512df36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:17:53 +0200 Subject: [PATCH 094/107] Preserve timestamp for sysusers conf --- anyterm.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 2be2e41..517ee91 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -63,6 +63,7 @@ install -Dp -m0644 anytermd.1.gz %{buildroot}%{_mandir}/man1/anytermd.1.gz install -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service +install -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf mkdir -p %{buildroot}%{_datadir}/anyterm/ for f in browser/*.{html,css,js,png,gif}; do @@ -76,9 +77,6 @@ cat < %{buildroot}%{_tmpfilesdir}/%{name}.conf d /run/%{name} 0755 root %{name} EOF -install -m0644 -D %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf - - %pre %sysusers_create_compat %{SOURCE6} From 1d0be521163a3a00d51aa53276c7a08aed6d6c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:22:31 +0200 Subject: [PATCH 095/107] Move tmpfiles conf to a source file --- anyterm.spec | 6 ++---- anyterm.tmpfiles.conf | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 anyterm.tmpfiles.conf diff --git a/anyterm.spec b/anyterm.spec index 517ee91..98d2081 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -15,6 +15,7 @@ Source1: anyterm-cmd Source4: anyterm.conf Source5: anyterm.service Source6: anyterm.sysusers.conf +Source7: anyterm.tmpfiles.conf # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch @@ -64,6 +65,7 @@ install -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service install -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf +install -Dp -m0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf mkdir -p %{buildroot}%{_datadir}/anyterm/ for f in browser/*.{html,css,js,png,gif}; do @@ -72,10 +74,6 @@ done # Create a home directory for the user. mkdir -p -m755 %{buildroot}/run/%{name} -mkdir -p %{buildroot}%{_tmpfilesdir} -cat < %{buildroot}%{_tmpfilesdir}/%{name}.conf -d /run/%{name} 0755 root %{name} -EOF %pre %sysusers_create_compat %{SOURCE6} diff --git a/anyterm.tmpfiles.conf b/anyterm.tmpfiles.conf new file mode 100644 index 0000000..c86af30 --- /dev/null +++ b/anyterm.tmpfiles.conf @@ -0,0 +1 @@ +d /run/anyterm 0755 root anyterm From 5986e55c657378086160eb7aa5d71b01a5b4e59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:27:52 +0200 Subject: [PATCH 096/107] Do not create /run directory in buildroot --- anyterm.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 98d2081..e89154a 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -72,9 +72,6 @@ for f in browser/*.{html,css,js,png,gif}; do install -m644 "$f" %{buildroot}%{_datadir}/anyterm/ done -# Create a home directory for the user. -mkdir -p -m755 %{buildroot}/run/%{name} - %pre %sysusers_create_compat %{SOURCE6} From 1b35f1de9febd72b8aa39fc18f0a9ca218d169bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:43:44 +0200 Subject: [PATCH 097/107] Preserve timestamp for web files --- anyterm.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index e89154a..5918f69 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -66,11 +66,14 @@ install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.co install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service install -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf install -Dp -m0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf - -mkdir -p %{buildroot}%{_datadir}/anyterm/ -for f in browser/*.{html,css,js,png,gif}; do - install -m644 "$f" %{buildroot}%{_datadir}/anyterm/ -done +install -Dp -m0644 browser/anyterm.css %{buildroot}%{_datadir}/anyterm/anyterm.css +install -Dp -m0644 browser/anyterm.html %{buildroot}%{_datadir}/anyterm/anyterm.html +install -Dp -m0644 browser/anyterm.js %{buildroot}%{_datadir}/anyterm/anyterm.js +install -Dp -m0644 browser/copy.gif %{buildroot}%{_datadir}/anyterm/copy.gif +install -Dp -m0644 browser/copy.png %{buildroot}%{_datadir}/anyterm/copy.png +install -Dp -m0644 browser/paste.gif %{buildroot}%{_datadir}/anyterm/paste.gif +install -Dp -m0644 browser/paste.png %{buildroot}%{_datadir}/anyterm/paste.png +install -Dp -m0644 browser/resizer.png %{buildroot}%{_datadir}/anyterm/resizer.png %pre %sysusers_create_compat %{SOURCE6} From c53d306ecb84bd1189034be1660682233cf4891a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 19:48:10 +0200 Subject: [PATCH 098/107] Use name macro more --- anyterm.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/anyterm.spec b/anyterm.spec index 5918f69..211979d 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -63,40 +63,40 @@ install -Dp -m0755 anytermd %{buildroot}%{_sbindir}/anytermd install -Dp -m0644 anytermd.1.gz %{buildroot}%{_mandir}/man1/anytermd.1.gz install -Dp -m0755 %{SOURCE1} %{buildroot}%{_libexecdir}/%{name}/anyterm-cmd install -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/anyterm.conf -install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/anyterm.service -install -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/anyterm.conf +install -Dp -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service +install -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/%{name}.conf install -Dp -m0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -Dp -m0644 browser/anyterm.css %{buildroot}%{_datadir}/anyterm/anyterm.css -install -Dp -m0644 browser/anyterm.html %{buildroot}%{_datadir}/anyterm/anyterm.html -install -Dp -m0644 browser/anyterm.js %{buildroot}%{_datadir}/anyterm/anyterm.js -install -Dp -m0644 browser/copy.gif %{buildroot}%{_datadir}/anyterm/copy.gif -install -Dp -m0644 browser/copy.png %{buildroot}%{_datadir}/anyterm/copy.png -install -Dp -m0644 browser/paste.gif %{buildroot}%{_datadir}/anyterm/paste.gif -install -Dp -m0644 browser/paste.png %{buildroot}%{_datadir}/anyterm/paste.png -install -Dp -m0644 browser/resizer.png %{buildroot}%{_datadir}/anyterm/resizer.png +install -Dp -m0644 browser/anyterm.css %{buildroot}%{_datadir}/%{name}/anyterm.css +install -Dp -m0644 browser/anyterm.html %{buildroot}%{_datadir}/%{name}/anyterm.html +install -Dp -m0644 browser/anyterm.js %{buildroot}%{_datadir}/%{name}/anyterm.js +install -Dp -m0644 browser/copy.gif %{buildroot}%{_datadir}/%{name}/copy.gif +install -Dp -m0644 browser/copy.png %{buildroot}%{_datadir}/%{name}/copy.png +install -Dp -m0644 browser/paste.gif %{buildroot}%{_datadir}/%{name}/paste.gif +install -Dp -m0644 browser/paste.png %{buildroot}%{_datadir}/%{name}/paste.png +install -Dp -m0644 browser/resizer.png %{buildroot}%{_datadir}/%{name}/resizer.png %pre %sysusers_create_compat %{SOURCE6} %post -%systemd_post anyterm.service +%systemd_post %{name}.service %preun -%systemd_preun anyterm.service +%systemd_preun %{name}.service %postun -%systemd_postun_with_restart anyterm.service +%systemd_postun_with_restart %{name}.service %files %{_sbindir}/anytermd %{_libexecdir}/anyterm/ %{_mandir}/man1/anytermd.1.gz -%{_datadir}/anyterm/ -%{_unitdir}/anyterm.service +%{_datadir}/%{name}/ +%{_unitdir}/%{name}.service %ghost %attr(0755,%{name},%{name}) %dir /run/%{name} %{_tmpfilesdir}/%{name}.conf %doc LICENSE -%{_sysusersdir}/anyterm.conf +%{_sysusersdir}/%{name}.conf %files httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf From 8dfc65b35c7a323379ff80c31f7c693713da54bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:07:28 +0200 Subject: [PATCH 099/107] Backport upstream changes --- anyterm-upstream-fixes-r18810.patch | 28 ++++++++++++++++++++++++++++ anyterm.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 anyterm-upstream-fixes-r18810.patch diff --git a/anyterm-upstream-fixes-r18810.patch b/anyterm-upstream-fixes-r18810.patch new file mode 100644 index 0000000..296d395 --- /dev/null +++ b/anyterm-upstream-fixes-r18810.patch @@ -0,0 +1,28 @@ +Index: src/SubProcess.cc +=================================================================== +diff --git a/anyterm/trunk/src/SubProcess.cc b/anyterm/trunk/src/SubProcess.cc +--- a/anyterm/trunk/src/SubProcess.cc (revision 13873) ++++ b/anyterm/trunk/src/SubProcess.cc (revision 18810) +@@ -141,7 +141,7 @@ + onOutput(s); + } + } RETHROW_MISC_EXCEPTIONS } +- catch (pbe::IOError) { ++ catch (pbe::IOError&) { + onError("Subprocess terminated"); + return; + } +Index: common.mk +=================================================================== +diff --git a/anyterm/trunk/common.mk b/anyterm/trunk/common.mk +--- a/anyterm/trunk/common.mk (revision 13873) ++++ b/anyterm/trunk/common.mk (revision 18810) +@@ -42,7 +42,7 @@ + + # If you need to add additional include directories, e.g. if your Boost libraries + # are somewhere unexpected, add them to CPP_FLAGS below e.g. CPP_FLAGS=-I/path/to/boost +-CPP_FLAGS=--std=c++14 ++CPP_FLAGS=--std=c++17 + + ifeq (${UNAME_S},SunOS) + GCC_FLAGS=-D_REENTRANT diff --git a/anyterm.spec b/anyterm.spec index 211979d..dbc5b28 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -19,6 +19,8 @@ Source7: anyterm.tmpfiles.conf # http://anyterm.org/1.1/install.html#secid2252601 Patch0: anyterm-change-url-prefix.patch +# svn diff --git -r 13873:18810 +Patch1: anyterm-upstream-fixes-r18810.patch BuildRequires: gcc-c++ BuildRequires: boost-devel @@ -51,6 +53,7 @@ The httpd configuration necessary to proxy anyterm. %prep %setup -q %patch -P0 -p0 +%patch -P1 -p3 %build export CFLAGS="$RPM_OPT_FLAGS" From f77fe4991a1ec12e639129d95bda84fe932cf86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:12:48 +0200 Subject: [PATCH 100/107] Remove upstreamed compiler flag --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index dbc5b28..73e56b7 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -57,7 +57,7 @@ The httpd configuration necessary to proxy anyterm. %build export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS -std=c++17" +export CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" OPTIMISE_FLAGS="$CXXFLAGS" gzip anytermd.1 From f5a3939ef054aad38d02b55adf4ec796280a339b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:19:12 +0200 Subject: [PATCH 101/107] Use _rundir macro --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 73e56b7..dafa419 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -96,7 +96,7 @@ install -Dp -m0644 browser/resizer.png %{buildroot}%{_datadir}/%{name}/resizer.p %{_mandir}/man1/anytermd.1.gz %{_datadir}/%{name}/ %{_unitdir}/%{name}.service -%ghost %attr(0755,%{name},%{name}) %dir /run/%{name} +%ghost %attr(0755,%{name},%{name}) %dir %{_rundir}/%{name} %{_tmpfilesdir}/%{name}.conf %doc LICENSE %{_sysusersdir}/%{name}.conf From 889fc7bc012e951bdb02d99afe42bb17ef02f698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:43:39 +0200 Subject: [PATCH 102/107] https for URL --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index dafa419..52e346d 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -4,7 +4,7 @@ Release: %autorelease Summary: A web-based terminal emulator License: GPL-2.0-or-later -URL: http://anyterm.org +URL: https://anyterm.org # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: From de643ba9670e200bcfe5552092e216508b82e38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:45:57 +0200 Subject: [PATCH 103/107] Whitespace cleanup --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 52e346d..99b64fb 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -44,7 +44,7 @@ Requires: httpd %description The Anyterm web-based terminal emulator, permits terminal and/or arbitrary command access via http. The anyterm daemon can be configured to run any -arbitrary command, redirecting all standard input / output / error to +arbitrary command, redirecting all standard input / output / error to and from any javascript-enabled web browser in real time. %description httpd From 11206c2e5c50ce305f303dc387e5681a6f39a814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 25 Apr 2025 20:46:15 +0200 Subject: [PATCH 104/107] Whitespace cleanup --- anyterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anyterm.spec b/anyterm.spec index 99b64fb..4c122c1 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -88,7 +88,7 @@ install -Dp -m0644 browser/resizer.png %{buildroot}%{_datadir}/%{name}/resizer.p %systemd_preun %{name}.service %postun -%systemd_postun_with_restart %{name}.service +%systemd_postun_with_restart %{name}.service %files %{_sbindir}/anytermd From 1b249ca5945d340cf80f603b2199cba3a8ac75d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:04:30 +0000 Subject: [PATCH 105/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e659aebf6bfd5397f47fe3b4295681b733393a9b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 17:11:49 +0000 Subject: [PATCH 106/107] Rebuilt for Boost 1.90 From 42b5c0bf1015aaeac496717f0becadf1f617c338 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:45:47 +0000 Subject: [PATCH 107/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild