- create config that works (for me)

[packages/anyterm.git] / anyterm.spec

diff --git a/anyterm.spec b/anyterm.spec
index 050d946eb188229e7ec8d48928111a6a5d64749d..1a0aba94b5b5da3e3a7c7c6cdaffebbc33c641fd 100644 (file)
--- a/anyterm.spec
+++ b/anyterm.spec
@@ -1,26 +1,26 @@
-#
 %define        apxs            /usr/sbin/apxs
 Summary:       Terminal emulator in a web browser
 Name:          anyterm
 Version:       1.1.4
-Release:       1
-Epoch:         1
+Release:       0.7
+Epoch:         0
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://anyterm.org/download/%{name}-%{version}.tbz2
 # Source0-md5: cf841703b7438866e573f5a33137ff6f
-Patch0:        %{name}-makefile.patch
+Patch0:                %{name}-makefile.patch
 URL:           http://anyterm.org/
 BuildRequires: apache-devel >= 2.0.52-2
 BuildRequires: apr-devel
 BuildRequires: rote-devel >= 0.2.8
+BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: %{apxs}
 Requires:      apache >= 2.0.52-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _httpdir        /home/services/httpd
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define   _sysconfdir /etc/httpd
+%define                _appdir         %{_datadir}/%{name}
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir /etc/httpd
 
 %description
 An apache module plus scripts to make a terminal within a web browser.
@@ -28,43 +28,74 @@ An apache module plus scripts to make a terminal within a web browser.
 %prep
 %setup -q
 %patch0 -p1
+mv -f browser/.htaccess htaccess
 
 %build
-rm -rf $RPM_BUILD_ROOT
-cd apachemod
-%{__make} \
-       INCLUDES='-I/usr/include/apr-util' \
-       APXS2=apxs \
+%{__make} -C apachemod \
+       INCLUDES='-I%{_includedir}/apr-util' \
+       APXS2=%{apxs} \
        APR_CONFIG=apr-1-config
-cd ..
-cd anygetty
-%{__make}
-cd ..
+%{__make} -C anygetty
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/httpd.conf,%{_pkglibdir},%{_mandir}/man8,%{_httpdir}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/httpd.conf,%{_pkglibdir},%{_mandir}/man8,%{_appdir}}
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_anyterm.conf <<END
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_anyterm.conf <<'END'
 LoadModule anyterm modules/%{name}.so
-Alias /%{name} "%{_httpdir}/%{name}"
-anyterm_command '/usr/sbin/anygetty --remotehost "Anyterm: %h"'
+<IfModule anyterm>
+       Alias /%{name} "%{_appdir}"
+       # hangs on login:
+#      anyterm_command '%{_sbindir}/anygetty --remotehost "Anyterm: %h"'
+       # works for me:
+       anyterm_command "USER=%u; exec /usr/bin/ssh ${USER:+$USER@}localhost"
+
+       <Files anyterm-module>
+               SetHandler anyterm
+       </Files>
+
+#      <Location /%{name}>
+#              allow from all
+#      </Location>
+
+    <Location /%{name}>
+        AuthType Basic
+        AuthUserFile /etc/httpd/user
+        AuthGroupFile /etc/httpd/group
+        AuthName "AnyTerm"
+        require group anyterm
+        satisfy any
+        order allow,deny
+    </Location>
+</IfModule>
+# vim: filetype=apache ts=4 sw=4 et
 END
 
 install apachemod/.libs/%{name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{name}.so
-cp -a browser $RPM_BUILD_ROOT/%{_httpdir}/%{name}
+cp -a browser/* $RPM_BUILD_ROOT%{_appdir}
 install anygetty/anygetty $RPM_BUILD_ROOT/%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%service httpd restart
+
+if [ "$1" = 1 ]; then
+       %banner %{name} <<-EOF
+       To use anygetty, you need to setuid it.
+       EOF
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+       %service -q httpd restart
+fi
+
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*
-%doc README
+%doc README CHANGELOG htaccess
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
 %attr(755,root,root) %{_pkglibdir}/%{name}.so
 %attr(755,root,root) %{_sbindir}/anygetty
-%{_httpdir}/%{name}
-
-%post
-%banner "for full function, setuid %{_sbindir}/anygetty"
+%{_appdir}