10 changed files with 517 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+/yaws-1.89.tar.gz
+/yaws-1.98.tar.gz
+*.rpm
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-Orphaned for 6+ weeks
--- a/1
+++ b/1
@ -0,0 +1 @@
+de009e46209a6acd27713665b661e711  yaws-1.98.tar.gz
--- a/yaws-1.98-conf.patch
+++ b/yaws-1.98-conf.patch
@ -0,0 +1,74 @@
+From a3c9edf6a82af97fb6f4b0c92199dec0a9aa4960 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 13 Feb 2014 20:20:31 +0100
+Subject: [PATCH] Fix up default configuration
+
+No SSL example to make rpmlint happy and no reliance on build host hostname.
+---
+ scripts/gen-yaws-conf      |  2 +-
+ scripts/regular-install    |  4 ++--
+ scripts/yaws.conf.template | 24 ++++++++++++------------
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/scripts/gen-yaws-conf b/scripts/gen-yaws-conf
+index c09cd20..81ac910 100755
+--- a/scripts/gen-yaws-conf
+++ b/scripts/gen-yaws-conf
+@@ -9,7 +9,7 @@ cat yaws.conf.template | \
+     ./Subst %yawsdir% "$YAWSDIR" | \
+     ./Subst %logdir% "$LOGDIR" | \
+     ./Subst %vardir% "$VARDIR" | \
+-    ./Subst %host% `hostname` | \
+    ./Subst %host% baphomet | \
+     ./Subst %port% $PORT | \
+     ./Subst %docroot% "$DOCROOT" | \
+     ./Subst %certdir% "$CERTDIR" | \
+diff --git a/scripts/regular-install b/scripts/regular-install
+index 17a69e8..3b2a5e2 100755
+--- a/scripts/regular-install
+++ b/scripts/regular-install
+@@ -23,7 +23,7 @@ else
+     [ -d "${DESTDIR}${ETCDIR}/yaws" ] || mkdir "${DESTDIR}${ETCDIR}/yaws"
+     cp yaws.conf "$conffile"
+ fi
+-cp ../ssl/yaws-cert.pem "${DESTDIR}${ETCDIR}/yaws"
+-cp ../ssl/yaws-key.pem "${DESTDIR}${ETCDIR}/yaws"
+#cp ../ssl/yaws-cert.pem "${DESTDIR}${ETCDIR}/yaws"
+#cp ../ssl/yaws-key.pem "${DESTDIR}${ETCDIR}/yaws"
+ 
+ exit 0
+diff --git a/scripts/yaws.conf.template b/scripts/yaws.conf.template
+index 57e998e..4314891 100644
+--- a/scripts/yaws.conf.template
+++ b/scripts/yaws.conf.template
+@@ -136,15 +136,15 @@ keepalive_timeout = 30000
+ 
+ # Now an SSL server
+ 
+-<server %host%>
+-        port = %sslport%
+-        docroot = /tmp
+-        listen = 0.0.0.0
+-        dir_listings = true
+-        auth_log = true
+-        <ssl>
+-                keyfile = %certdir%/yaws-key.pem
+-                certfile = %certdir%/yaws-cert.pem
+-                depth = 0
+-        </ssl>
+-</server>
+#<server %host%>
+#        port = %sslport%
+#        docroot = /tmp
+#        listen = 0.0.0.0
+#        dir_listings = true
+#        auth_log = true
+#        <ssl>
+#                keyfile = %certdir%/yaws-key.pem
+#                certfile = %certdir%/yaws-cert.pem
+#                depth = 0
+#        </ssl>
+#</server>
+-- 
+1.8.3.1
+
--- a/yaws-1.98-fhs.patch
+++ b/yaws-1.98-fhs.patch
@ -0,0 +1,138 @@
+From af16ac52d6d3f55859b46f5e7b01d5f30deb9522 Mon Sep 17 00:00:00 2001
+From: Filip Andres <filip.andres@gooddata.com>
+Date: Tue, 3 Jan 2012 13:43:17 +0100
+Subject: [PATCH] Install into FHS-compliant hierarchy
+
+Basically move /var/yaws into /var/lib/yaws and ensure logs stay in /var/log.
+[lkundrak@v3.sk: Rebased to 1.98, some issues addressed upstream, some not].
+---
+ Makefile                   | 2 +-
+ examples/src/Makefile      | 2 +-
+ scripts/Makefile           | 4 ++--
+ scripts/local-install      | 5 +++--
+ scripts/yaws.conf.template | 2 +-
+ src/Makefile               | 6 +++---
+ www/code/Makefile          | 2 +-
+ www/shoppingcart/Makefile  | 2 +-
+ 8 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 51648bc..48f98b6 100644
+--- a/Makefile
+++ b/Makefile
+@@ -36,7 +36,7 @@ install:	all
+ 	@echo "** executables went into      ${prefix}/bin"
+ 	@echo "** library files went into    ${LIBDIR}/yaws"
+ 	@echo "** var files went into        ${VARDIR}"
+-	@echo "** default docroot went into  ${VARDIR}/yaws/www"
+	@echo "** default docroot went into  ${VARDIR}/lib/yaws/www"
+ 	@echo
+ 	@echo "--------------------------------"
+ 
+diff --git a/examples/src/Makefile b/examples/src/Makefile
+index a4926a9..14efdf3 100644
+--- a/examples/src/Makefile
+++ b/examples/src/Makefile
+@@ -27,4 +27,4 @@ clean:
+ 	rm -f $(EBIN_FILES)
+ 
+ install: all
+-	cp -f ../ebin/*.beam $(DESTDIR)$(VARDIR)/yaws/ebin
+	cp -f ../ebin/*.beam $(DESTDIR)$(VARDIR)/lib/yaws/ebin
+diff --git a/scripts/Makefile b/scripts/Makefile
+index 22044e9..5ca2f34 100644
+--- a/scripts/Makefile
+++ b/scripts/Makefile
+@@ -13,8 +13,8 @@ local_install:	../bin/yaws
+ 	VARDIR="${HOME}/var" ./local-install true
+ 
+ yaws.conf:
+-	YAWSDIR='$(LIBDIR)/yaws' LOGDIR='$(PREFIX)/var/log/yaws' \
+-	VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/yaws/www' \
+	YAWSDIR='$(LIBDIR)/yaws' LOGDIR='$(VARDIR)/log/yaws' \
+	VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/lib/yaws/www' \
+ 	CERTDIR='$(ETCDIR)/yaws' SSLPORT=443 ./gen-yaws-conf > $@
+ 
+ clean:
+diff --git a/scripts/local-install b/scripts/local-install
+index 23e163b..1a8c4e6 100755
+--- a/scripts/local-install
+++ b/scripts/local-install
+@@ -41,8 +41,9 @@ fi
+ 
+ topdir=`cd .. && pwd`
+ [ -d "${VARDIR}" ] || mkdir "${VARDIR}"
+-[ -d "${VARDIR}/yaws" ] || mkdir "${VARDIR}/yaws"
+-[ -d "${VARDIR}/yaws/ebin" ] || mkdir "${VARDIR}/yaws/ebin"
+[ -d "${VARDIR}/lib" ] || mkdir "${VARDIR}/lib"
+[ -d "${VARDIR}/lib/yaws" ] || mkdir "${VARDIR}/lib/yaws"
+[ -d "${VARDIR}/lib/yaws/ebin" ] || mkdir "${VARDIR}/lib/yaws/ebin"
+ YAWSDIR="$topdir" LOGDIR="$logdir" VARDIR="$VARDIR" PORT=8000 \
+     DOCROOT="${topdir}/www" CERTDIR="${topdir}/ssl" SSLPORT=4443 \
+     ./gen-yaws-conf > $tmpgen
+diff --git a/scripts/yaws.conf.template b/scripts/yaws.conf.template
+index d611996..57e998e 100644
+--- a/scripts/yaws.conf.template
+++ b/scripts/yaws.conf.template
+@@ -11,7 +11,7 @@ logdir = %logdir%
+ # beam code can be placed. The daemon will add these
+ # directories to its search path.
+ ebin_dir = %yawsdir%/examples/ebin
+-ebin_dir = %vardir%/yaws/ebin
+ebin_dir = %vardir%/lib/yaws/ebin
+ 
+ # This is a directory where application specific .hrl
+ # files can be placed. Application-specific .yaws code can
+diff --git a/src/Makefile b/src/Makefile
+index b0341ef..29780a7 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -105,7 +105,7 @@ install: all docsinstall
+ 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/ebin
+ 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/priv
+ 	$(INSTALL) -d $(DESTDIR)$(VARDIR)/log/yaws
+-	$(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/ebin
+	$(INSTALL) -d $(DESTDIR)$(VARDIR)/lib/yaws/ebin
+ 	(cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ 	(cd ..; tar cf - include ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ 	(cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+@@ -113,8 +113,8 @@ install: all docsinstall
+ 	$(MAKE) IS_LOCAL_INSTALL=true gen_yaws_generated
+ 
+ docsinstall:
+-	$(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/www
+-	(cd ..; tar cf - www ) | (cd $(DESTDIR)$(VARDIR)/yaws; tar xf - )
+	$(INSTALL) -d $(DESTDIR)$(VARDIR)/lib/yaws/www
+	(cd ..; tar cf - www ) | (cd $(DESTDIR)$(VARDIR)/lib/yaws; tar xf - )
+ 
+ tags:
+ 	erl  -noshell -pa ../ebin -s yaws_debug mktags
+diff --git a/www/code/Makefile b/www/code/Makefile
+index 17e600e..f267542 100644
+--- a/www/code/Makefile
+++ b/www/code/Makefile
+@@ -5,7 +5,7 @@ all:	myappmod.beam
+ debug:
+ 
+ install:	all
+-	cp -f myappmod.beam $(DESTDIR)$(VARDIR)/yaws/ebin
+	cp -f myappmod.beam $(DESTDIR)$(VARDIR)/lib/yaws/ebin
+ 
+ clean:
+ 	$(RM) myappmod.beam
+diff --git a/www/shoppingcart/Makefile b/www/shoppingcart/Makefile
+index 580fb3f..063f313 100644
+--- a/www/shoppingcart/Makefile
+++ b/www/shoppingcart/Makefile
+@@ -5,7 +5,7 @@ all:	shopcart.beam
+ debug:
+ 
+ install:	all
+-	cp -f shopcart.beam $(DESTDIR)$(VARDIR)/yaws/ebin
+	cp -f shopcart.beam $(DESTDIR)$(VARDIR)/lib/yaws/ebin
+ 
+ clean:
+ 	$(RM) -f shopcart.beam
+-- 
+1.8.3.1
+
--- a/yaws-1.98-m32.patch
+++ b/yaws-1.98-m32.patch
@ -0,0 +1,39 @@
+From b69c7769202e2e547e403dfba88c8ba8b6e140a3 Mon Sep 17 00:00:00 2001
+From: Filip Andres <filip@andresovi.net>
+Date: Fri, 26 Jun 2015 14:20:23 +0200
+Subject: [PATCH] do not use -m32 on armv7 and s390
+
+---
+ configure    | 2 +-
+ configure.in | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 862d6f1..429aeee 100755
+--- a/configure
+++ b/configure
+@@ -4096,7 +4096,7 @@ else
+ $as_echo "$as_me: found 32-bit Erlang" >&6;}
+                    case "$host_cpu" in
+                        i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
+                       armv[67]*|s390) CBIT= ;;
+                        *) CBIT=-m32 ;;
+                    esac
+ fi
+diff --git a/configure.in b/configure.in
+index b83aae2..476726b 100644
+--- a/configure.in
+++ b/configure.in
+@@ -237,7 +237,7 @@ case "$host_os" in
+ 	       [AC_MSG_NOTICE(found 32-bit Erlang)
+                    case "$host_cpu" in
+                        i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
+                       armv[67]*|s390) CBIT= ;;
+                        *) CBIT=-m32 ;;
+                    esac])
+            CFLAGS="$CFLAGS $CBIT"
+-- 
+2.1.0
+
--- a/yaws.logrotate
+++ b/yaws.logrotate
@ -0,0 +1,11 @@
+/var/log/yaws/*.log /var/log/yaws/*.access {
+	weekly
+	rotate 2
+	missingok
+	sharedscripts
+	notifempty
+	sharedscripts
+	postrotate
+		/sbin/service yaws reload >/dev/null 2>&1 || :
+	endscript
+}
--- a/yaws.service
+++ b/yaws.service
@ -0,0 +1,17 @@
+# REMOVEME: This file is only for backward compatibility
+# REMOVEME: It should be remove for releases after epel7
+[Unit]
+Description=The Yaws Web Server instance
+After=network.target
+
+[Service]
+User=root
+Type=notify
+Environment="HOME=/var/lib/yaws"
+Type=simple
+ExecStart=/usr/bin/yaws --erlarg -noinput --daemon --conf /etc/yaws/.conf
+ExecReload=/usr/bin/yaws --hup
+ExecStop=/usr/bin/yaws --stop
+
+[Install]
+WantedBy=multi-user.target
--- a/yaws.spec
+++ b/yaws.spec
@ -0,0 +1,219 @@
+%bcond_without docs
+
+Name:           yaws
+Version:        1.98
+Release:        7%{?dist}
+Summary:        Web server for dynamic content written in Erlang
+Group:          System Environment/Daemons
+# BSD: see LICENSE
+# ERPL: json.erl, benchmarks/bench.erl, benchmarks/bench.hrl,
+#        benchmarks/all.erl, haxe.erl
+# Copyright only: priv/soap.xsd, priv/wsdl.xsd
+# W3C: priv/envelope.xsd
+License:        BSD and ERPL and Copyright only and W3C
+URL:            http://yaws.hyber.org/
+Source0:        http://yaws.hyber.org/download/%{name}-%{version}.tar.gz
+Source1:        yaws.logrotate
+Source2:        yaws@.service
+Source3:        yaws.service
+Patch1:         yaws-1.98-fhs.patch
+Patch2:         yaws-1.98-conf.patch
+Patch3:         yaws-1.98-m32.patch
+
+BuildRequires:  systemd-units
+BuildRequires:  erlang-erts
+BuildRequires:  erlang-erlsom
+BuildRequires:  erlang-kernel
+BuildRequires:  erlang-mnesia
+BuildRequires:  erlang-sasl
+BuildRequires:  erlang-ssl
+BuildRequires:  erlang-stdlib
+BuildRequires:  pam-devel
+%if %{with docs}
+BuildRequires:  tex(latex)
+BuildRequires:  tex(dvips)
+BuildRequires:  tex-epstopdf
+BuildRequires:  latex2html
+%endif
+
+Requires:       erlang >= R13B
+Requires:       erlang-erlsom
+Requires:       erlang-ibrowse
+Requires:       erlang-xmlrpc
+Requires:       logrotate
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
+
+
+%description
+HTTP 1.0 and HTTP 1.1 web server capable of both static content page
+delivery and dynamic content generation using embedded Erlang code in the
+HTML pages. It provides virtual hosting capabilities and implements
+HTTP tracing and other debugging functionality such as interactive
+interpreter environment. Performance can be boosted with built-in support
+for RAM caching and streaming capabilities of dynamically generated
+content. Among security features are SSL and support for WWW-Authenticated
+pages.
+
+
+%package devel
+Summary:        Development Files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package contains a pkg-config configuration for %{name}.
+
+
+%prep
+%setup -q
+%patch1 -p1 -b .fhs
+%patch2 -p1 -b .conf
+%patch3 -p1 -b .m32
+
+# This requires egssapi which is not yet available
+rm -f src/authmod_gssapi.erl
+
+# Weird file name in Change Log is latin1-encoded
+iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
+touch -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
+
+# These are corrupted
+find . -name '*.dia' -delete
+
+
+%build
+%configure
+make %{?_smp_mflags} all
+%if %{with docs}
+# fails to build with smp_mflags sometimes
+make docs EPSTOPDF=epstopdf
+%endif
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Move init script to correct location
+install -d $RPM_BUILD_ROOT%{_initrddir}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/yaws \
+        $RPM_BUILD_ROOT%{_initrddir}/yaws
+rmdir $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+
+# Logrotate configuration
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/yaws
+
+# The systemd bits
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
+
+# Backward compatibility: keep "systemctl start yaws"
+# This should be removed in the future
+install -p -m0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/yaws.service
+
+
+%post
+%systemd_post yaws@yaws.service
+
+
+%preun
+%systemd_preun yaws@yaws.service
+
+
+%postun
+%systemd_postun
+
+
+%files
+%defattr(-,root,root,-)
+%exclude %{_initrddir}/yaws
+%{_unitdir}/yaws@.service
+%{_unitdir}/yaws.service
+%dir %{_sysconfdir}/yaws
+%config(noreplace) %{_sysconfdir}/yaws/yaws.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/yaws
+%dir %{_localstatedir}/log/%{name}
+%{_localstatedir}/lib/yaws
+%{_bindir}/yaws
+%{_libdir}/yaws
+%exclude %{_libdir}/yaws/ebin/.empty
+%if %{with docs}
+%doc %{_docdir}/yaws/yaws.pdf
+%endif
+%doc %{_datadir}/man/man1/yaws.1*
+%doc %{_datadir}/man/man5/yaws.conf.5*
+%doc %{_datadir}/man/man5/yaws_api.5*
+%doc README LICENSE ChangeLog
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/yaws.pc
+
+
+%changelog
+* Mon Jul 13 2015 Dan Horák <dan[at]danny.cz> - 1.98-7
+- skip -m32 also on s390
+
+* Fri Jun 26 2015 Filip Andres <filip@andresovi.net> - 1.98-6
+- Do not use -m32 flag on armv7 builds
+
+* Sun Apr 5 2015 Antoine Catton <devel@antoine.catton.fr> - 1.98-5
+- Tested with SELinux
+
+* Wed Dec 31 2014 Antoine Catton <devel@antoine.catton.fr> - 1.98-4
+- Remove "--deamon" option (which was forking)
+
+* Sat Dec 06 2014 Antoine Catton <devel@antoine.catton.fr> - 1.98-3
+- Rename unit file to allow to specify an instance (while keeping backward compatible instance file)
+- Add ability stop and reload yaws with systemctl
+- Support running multiple instance
+- Do not fork from systemd
+
+* Fri Feb 21 2014 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.98-2
+- sysvinit -> systemd
+- Remove old RPM artifacts
+
+* Thu Feb 13 2014 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.98-1
+- Rebase
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.92-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.92-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jan 03 2012 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.92-1
+- Update
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.89-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Nov 18 2010 Peter Lemenkov <lemenkov@gmail.com> - 1.89-3
+- Make building docs conditional
+- Added one more module to package
+- Added missing runtime dependency - erlang-xmlrpc
+
+* Thu Oct 21 2010 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.89-2
+- Require newer Erlang (Peter Lemenkov)
+- Exclude examples/ and src/
+
+* Wed Oct 20 2010 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.89-1
+- Rebase to 1.89
+- No longer required patch for compiling using system-wide erlsom (Peter Lemenkov)
+- Ver. 1.89 now requires erlang-ibrowse library (Peter Lemenkov)
+- Shorten the dependency chain (Peter Lemenkov)
+
+* Mon Sep 13 2010 Lubomir Rintel (GoodData) <lkundrak@v3.sk> - 1.88-1
+- Rebase to 1.88
+- Look for erlsom in system-wide location (Peter Lemenkov)
+- Drop authmod_gssapi, dependencies not satisfied
+
+* Sat Nov 21 2009 Lubomir Rintel (Good Data) <lkundrak@v3.sk> - 1.85-2
+- Install to erlang lib directory, make arch dependent
+- Install the source code
+
+* Mon Nov 02 2009 Lubomir Rintel (Good Data) <lkundrak@v3.sk> - 1.85-1
+- Initial packaging, partly based on Hans Ulrich Niedermann's package
--- a/yaws@.service
+++ b/yaws@.service
@ -0,0 +1,15 @@
+[Unit]
+Description=The Yaws Web Server instance
+After=network.target
+
+[Service]
+User=root
+Type=notify
+Environment="HOME=/var/lib/yaws"
+Type=simple
+ExecStart=/usr/bin/yaws --erlarg -noinput --id %i --conf /etc/yaws/%i.conf
+ExecReload=/usr/bin/yaws --hup --id %i
+ExecStop=/usr/bin/yaws --stop --id %i
+
+[Install]
+WantedBy=multi-user.target
				`@ -0,0 +1 @@`
				`de009e46209a6acd27713665b661e711 yaws-1.98.tar.gz`