From b9aaeedbcde44edb3b1d5a7ef0b85a6e083f9c66 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Nov 2008 01:46:23 +0000 Subject: [PATCH 1/6] Initialize branch EL-5 for Ajaxterm --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From c04ebdb7168bbee712ef68d5412516ab4fcf96a8 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Sat, 22 Nov 2008 15:27:39 +0000 Subject: [PATCH 2/6] - set LANG=C in initscript, Ajaxterm doesn't support UTF-8 - One last spec cleanup --- .cvsignore | 1 + Ajaxterm-init.patch | 47 ++++++++++++++++++++ Ajaxterm.spec | 104 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 153 insertions(+) create mode 100644 Ajaxterm-init.patch create mode 100644 Ajaxterm.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3df8740 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Ajaxterm-0.10.tar.gz diff --git a/Ajaxterm-init.patch b/Ajaxterm-init.patch new file mode 100644 index 0000000..1f1a5e6 --- /dev/null +++ b/Ajaxterm-init.patch @@ -0,0 +1,47 @@ +diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat +--- Ajaxterm-0.10/configure.initd.redhat.orig 2008-11-22 13:45:35.000000000 +0100 ++++ Ajaxterm-0.10/configure.initd.redhat 2008-11-22 13:46:38.000000000 +0100 +@@ -1,8 +1,8 @@ +-# ++#!/bin/bash + # ajaxterm Startup script for ajaxterm + # + # chkconfig: - 99 99 +-# description: Ajaxterm is a yadda yadda yadda ++# description: Ajaxterm is a web-based terminal + # processname: ajaxterm + # pidfile: /var/run/ajaxterm.pid + # version: 1.0 Kevin Reichhart - ajaxterminit at lastname dot org +@@ -14,18 +14,18 @@ if [ -f /etc/sysconfig/ajaxterm ]; then + . /etc/sysconfig/ajaxterm + fi + +-ajaxterm=/usr/local/bin/ajaxterm ++ajaxterm=/usr/bin/ajaxterm + prog=ajaxterm +-pidfile=${PIDFILE-/var/run/ajaxterm.pid} +-lockfile=${LOCKFILE-/var/lock/subsys/ajaxterm} ++pidfile=/var/run/ajaxterm.pid ++lockfile=/var/lock/subsys/ajaxterm + port=${PORT-8022} +-user=${xUSER-nobody} ++user=${USER-ajaxterm} + RETVAL=0 + + + start() { + echo -n $"Starting $prog: " +- daemon $ajaxterm --daemon --port=$port --uid=$user $OPTIONS ++ LANG=C daemon $ajaxterm --daemon --port=$port --uid=$user $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} +@@ -54,7 +54,7 @@ case "$1" in + stop + ;; + status) +- status python ajaxterm ++ status $prog + RETVAL=$? + ;; + restart) diff --git a/Ajaxterm.spec b/Ajaxterm.spec new file mode 100644 index 0000000..f5067e4 --- /dev/null +++ b/Ajaxterm.spec @@ -0,0 +1,104 @@ +Name: Ajaxterm +Version: 0.10 +Release: 5%{?dist} +Summary: A web-based terminal + +Group: Development/Languages +License: Public Domain and LGPLv2+ +URL: http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm +Source0: http://antony.lesuisse.org/qweb/files/%{name}-%{version}.tar.gz +Patch0: Ajaxterm-init.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python + +Requires(pre): shadow-utils +Requires(post): chkconfig +Requires(preun): chkconfig, initscripts +Requires(postun): initscripts + +%description +Ajaxterm is a web based terminal. It was totally inspired and works almost +exactly like http://anyterm.org/ except it's much easier to install. + +%prep +%setup -q +%patch0 -p1 -b .orig +sed -i 's|\r||' README.txt # fix eol encoding +sed -i 's|bin/python2.3|bin/python|' qweb.py + + + +%build +./configure --prefix=%{buildroot}%{_prefix} --confdir=%{buildroot}%{_sysconfdir} + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{_sysconfdir}/init.d +mkdir -p %{buildroot}/%{_initrddir} +make install + +mv %{buildroot}%{_sysconfdir}/init.d/ajaxterm %{buildroot}%{_initrddir}/ajaxterm +rmdir %{buildroot}/%{_sysconfdir}/init.d +chmod 0755 %{buildroot}%{_datadir}/ajaxterm/qweb.py +chmod 0644 %{buildroot}%{_mandir}/man1/ajaxterm.1.gz +cat <%{buildroot}%{_bindir}/ajaxterm +#!/bin/sh +PYTHONPATH=/usr/share/ajaxterm exec /usr/share/ajaxterm/ajaxterm.py \$@ +EOF + +%clean +rm -rf %{buildroot} + +%pre +getent group ajaxterm >/dev/null || groupadd -r ajaxterm +getent passwd ajaxterm >/dev/null || \ +useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \ +-c "Ajaxterm user" ajaxterm +exit 0 + +%post +/sbin/chkconfig --add ajaxterm + +%preun +if [ $1 = 0 ]; then + /sbin/service ajaxterm stop >/dev/null 2>&1 || : + /sbin/chkconfig --del ajaxterm +fi + +%postun +if [ $1 -ge 1 ] ; then + /sbin/service ajaxterm condrestart > /dev/null 2>&1 || : +fi + + + +%files +%defattr(-,root,root,-) +%doc README.txt +%{_initrddir}/ajaxterm +%{_bindir}/ajaxterm +%{_datadir}/ajaxterm +%{_mandir}/man1/ajaxterm.1.gz + + +%changelog +* Sat Nov 22 2008 Ruben Kerkhof 0.10-5 +- set LANG=C in initscript, Ajaxterm doesn't support UTF-8 +- One last spec cleanup + + +* Sun Nov 09 2008 Ruben Kerkhof 0.10-4 +- More review fixes (#470508) + +* Sun Nov 09 2008 Ruben Kerkhof 0.10-3 +- More review fixes (#470508) + +* Sun Nov 09 2008 Ruben Kerkhof 0.10-2 +- Review fixes (#470508) + +* Fri Nov 07 2008 Ruben Kerkhof 0.10-1 +- Initial import + diff --git a/sources b/sources index e69de29..5b39919 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b10830a7a81d2a4c9f8815510dafb87a Ajaxterm-0.10.tar.gz From fe9a5a8d93c1b14abe885b4ecb54b80eedc1f841 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 7 Apr 2009 16:17:34 +0000 Subject: [PATCH 3/6] - Fix ajaxterm homedir - Add status command to init script --- Ajaxterm-init.patch | 13 +++++++++++-- Ajaxterm.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Ajaxterm-init.patch b/Ajaxterm-init.patch index 1f1a5e6..ff623d9 100644 --- a/Ajaxterm-init.patch +++ b/Ajaxterm-init.patch @@ -1,6 +1,6 @@ diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat ---- Ajaxterm-0.10/configure.initd.redhat.orig 2008-11-22 13:45:35.000000000 +0100 -+++ Ajaxterm-0.10/configure.initd.redhat 2008-11-22 13:46:38.000000000 +0100 +--- Ajaxterm-0.10/configure.initd.redhat.orig 2006-10-29 03:52:39.000000000 +0100 ++++ Ajaxterm-0.10/configure.initd.redhat 2009-04-06 14:51:15.000000000 +0200 @@ -1,8 +1,8 @@ -# +#!/bin/bash @@ -45,3 +45,12 @@ diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd RETVAL=$? ;; restart) +@@ -68,7 +68,7 @@ case "$1" in + fi + ;; + *) +- echo $"Usage: $prog {start|stop|restart|condrestart}" ++ echo $"Usage: $prog {start|stop|status|restart|condrestart}" + exit 1 + esac + diff --git a/Ajaxterm.spec b/Ajaxterm.spec index f5067e4..7d05072 100644 --- a/Ajaxterm.spec +++ b/Ajaxterm.spec @@ -1,6 +1,6 @@ Name: Ajaxterm Version: 0.10 -Release: 5%{?dist} +Release: 8%{?dist} Summary: A web-based terminal Group: Development/Languages @@ -55,7 +55,7 @@ rm -rf %{buildroot} %pre getent group ajaxterm >/dev/null || groupadd -r ajaxterm getent passwd ajaxterm >/dev/null || \ -useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \ +useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \ -c "Ajaxterm user" ajaxterm exit 0 @@ -85,6 +85,10 @@ fi %changelog +* Tue Apr 07 2009 Ruben Kerkhof 0.10-8 +- Fix ajaxterm homedir +- Add status command to init script + * Sat Nov 22 2008 Ruben Kerkhof 0.10-5 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8 - One last spec cleanup From 493821f2501d621a58b52ed38a1691b6f0d7b350 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:17 +0000 Subject: [PATCH 4/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8987d7..adb41cb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := Ajaxterm 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 64d4e2b5a034e234d5d00147db5d5ca8a8b0c435 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:57 +0000 Subject: [PATCH 5/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 adb41cb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: Ajaxterm -# $Id$ -NAME := Ajaxterm -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/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 6a4b47035184001319d4a7640bea0c76ef7565a1 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Fri, 23 Jan 2015 18:01:25 +0100 Subject: [PATCH 6/6] 2015-01-23: Retired orphaned package, because it was orphaned for more than six weeks. Reference: https://fedorahosted.org/epel/ticket/7 --- .gitignore | 1 - Ajaxterm-init.patch | 56 ----------------------- Ajaxterm.spec | 108 -------------------------------------------- dead.package | 3 ++ sources | 1 - 5 files changed, 3 insertions(+), 166 deletions(-) delete mode 100644 .gitignore delete mode 100644 Ajaxterm-init.patch delete mode 100644 Ajaxterm.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3df8740..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Ajaxterm-0.10.tar.gz diff --git a/Ajaxterm-init.patch b/Ajaxterm-init.patch deleted file mode 100644 index ff623d9..0000000 --- a/Ajaxterm-init.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat ---- Ajaxterm-0.10/configure.initd.redhat.orig 2006-10-29 03:52:39.000000000 +0100 -+++ Ajaxterm-0.10/configure.initd.redhat 2009-04-06 14:51:15.000000000 +0200 -@@ -1,8 +1,8 @@ --# -+#!/bin/bash - # ajaxterm Startup script for ajaxterm - # - # chkconfig: - 99 99 --# description: Ajaxterm is a yadda yadda yadda -+# description: Ajaxterm is a web-based terminal - # processname: ajaxterm - # pidfile: /var/run/ajaxterm.pid - # version: 1.0 Kevin Reichhart - ajaxterminit at lastname dot org -@@ -14,18 +14,18 @@ if [ -f /etc/sysconfig/ajaxterm ]; then - . /etc/sysconfig/ajaxterm - fi - --ajaxterm=/usr/local/bin/ajaxterm -+ajaxterm=/usr/bin/ajaxterm - prog=ajaxterm --pidfile=${PIDFILE-/var/run/ajaxterm.pid} --lockfile=${LOCKFILE-/var/lock/subsys/ajaxterm} -+pidfile=/var/run/ajaxterm.pid -+lockfile=/var/lock/subsys/ajaxterm - port=${PORT-8022} --user=${xUSER-nobody} -+user=${USER-ajaxterm} - RETVAL=0 - - - start() { - echo -n $"Starting $prog: " -- daemon $ajaxterm --daemon --port=$port --uid=$user $OPTIONS -+ LANG=C daemon $ajaxterm --daemon --port=$port --uid=$user $OPTIONS - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} -@@ -54,7 +54,7 @@ case "$1" in - stop - ;; - status) -- status python ajaxterm -+ status $prog - RETVAL=$? - ;; - restart) -@@ -68,7 +68,7 @@ case "$1" in - fi - ;; - *) -- echo $"Usage: $prog {start|stop|restart|condrestart}" -+ echo $"Usage: $prog {start|stop|status|restart|condrestart}" - exit 1 - esac - diff --git a/Ajaxterm.spec b/Ajaxterm.spec deleted file mode 100644 index 7d05072..0000000 --- a/Ajaxterm.spec +++ /dev/null @@ -1,108 +0,0 @@ -Name: Ajaxterm -Version: 0.10 -Release: 8%{?dist} -Summary: A web-based terminal - -Group: Development/Languages -License: Public Domain and LGPLv2+ -URL: http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm -Source0: http://antony.lesuisse.org/qweb/files/%{name}-%{version}.tar.gz -Patch0: Ajaxterm-init.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch -BuildRequires: python - -Requires(pre): shadow-utils -Requires(post): chkconfig -Requires(preun): chkconfig, initscripts -Requires(postun): initscripts - -%description -Ajaxterm is a web based terminal. It was totally inspired and works almost -exactly like http://anyterm.org/ except it's much easier to install. - -%prep -%setup -q -%patch0 -p1 -b .orig -sed -i 's|\r||' README.txt # fix eol encoding -sed -i 's|bin/python2.3|bin/python|' qweb.py - - - -%build -./configure --prefix=%{buildroot}%{_prefix} --confdir=%{buildroot}%{_sysconfdir} - - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}/%{_sysconfdir}/init.d -mkdir -p %{buildroot}/%{_initrddir} -make install - -mv %{buildroot}%{_sysconfdir}/init.d/ajaxterm %{buildroot}%{_initrddir}/ajaxterm -rmdir %{buildroot}/%{_sysconfdir}/init.d -chmod 0755 %{buildroot}%{_datadir}/ajaxterm/qweb.py -chmod 0644 %{buildroot}%{_mandir}/man1/ajaxterm.1.gz -cat <%{buildroot}%{_bindir}/ajaxterm -#!/bin/sh -PYTHONPATH=/usr/share/ajaxterm exec /usr/share/ajaxterm/ajaxterm.py \$@ -EOF - -%clean -rm -rf %{buildroot} - -%pre -getent group ajaxterm >/dev/null || groupadd -r ajaxterm -getent passwd ajaxterm >/dev/null || \ -useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \ --c "Ajaxterm user" ajaxterm -exit 0 - -%post -/sbin/chkconfig --add ajaxterm - -%preun -if [ $1 = 0 ]; then - /sbin/service ajaxterm stop >/dev/null 2>&1 || : - /sbin/chkconfig --del ajaxterm -fi - -%postun -if [ $1 -ge 1 ] ; then - /sbin/service ajaxterm condrestart > /dev/null 2>&1 || : -fi - - - -%files -%defattr(-,root,root,-) -%doc README.txt -%{_initrddir}/ajaxterm -%{_bindir}/ajaxterm -%{_datadir}/ajaxterm -%{_mandir}/man1/ajaxterm.1.gz - - -%changelog -* Tue Apr 07 2009 Ruben Kerkhof 0.10-8 -- Fix ajaxterm homedir -- Add status command to init script - -* Sat Nov 22 2008 Ruben Kerkhof 0.10-5 -- set LANG=C in initscript, Ajaxterm doesn't support UTF-8 -- One last spec cleanup - - -* Sun Nov 09 2008 Ruben Kerkhof 0.10-4 -- More review fixes (#470508) - -* Sun Nov 09 2008 Ruben Kerkhof 0.10-3 -- More review fixes (#470508) - -* Sun Nov 09 2008 Ruben Kerkhof 0.10-2 -- Review fixes (#470508) - -* Fri Nov 07 2008 Ruben Kerkhof 0.10-1 -- Initial import - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..2b40aca --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2015-01-23: Retired orphaned package, because it was orphaned for more than six weeks. +Reference: https://fedorahosted.org/epel/ticket/7 + diff --git a/sources b/sources deleted file mode 100644 index 5b39919..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b10830a7a81d2a4c9f8815510dafb87a Ajaxterm-0.10.tar.gz