From: Raphaƫl Gertz Date: Tue, 21 Jun 2016 05:42:43 +0000 (+0200) Subject: Add missing debug-sshd service X-Git-Tag: 2.4.38-6~16 X-Git-Url: https://git.rapsys.eu/ihttpd/commitdiff_plain/985f8d25bdd17fde0ffef26373378ac15fb2d8fe?hp=7e52b5763961f6bd9860ba0d8fa16c4789f6ad7b Add missing debug-sshd service Fix description in ihttpd service Cleanup in spec file --- diff --git a/SOURCES/debug-sshd.service b/SOURCES/debug-sshd.service new file mode 100644 index 0000000..491d96f --- /dev/null +++ b/SOURCES/debug-sshd.service @@ -0,0 +1,14 @@ +# Based on /usr/lib/systemd/system/debug-shell.service +[Unit] +Description=Early sshd shell FOR DEBUGGING ONLY +DefaultDependencies=no +AllowIsolate=no +IgnoreOnIsolate=yes + +[Service] +Type=simple +KillMode=none +ExecStart=@/usr/sbin/sshd /usr/sbin/sshd -e + +[Install] +WantedBy=sysinit.target diff --git a/SOURCES/ihttpd.service b/SOURCES/ihttpd.service index 00bfcd3..0c055f4 100644 --- a/SOURCES/ihttpd.service +++ b/SOURCES/ihttpd.service @@ -1,6 +1,6 @@ # Based on /usr/lib/systemd/system/debug-shell.service [Unit] -Description=Spawn apache ihttpd server to answer password requests +Description=The Apache HTTP Server answering password requests DefaultDependencies=no AllowIsolate=no IgnoreOnIsolate=yes diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec index e71e50a..a7c4ff7 100644 --- a/SPECS/ihttpd.spec +++ b/SPECS/ihttpd.spec @@ -6,7 +6,7 @@ Name: ihttpd Version: 2.4.20 -Release: %mkrel 1 +Release: %mkrel 2 Summary: The most widely used Web server on the Internet License: Apache License Group: System/Servers @@ -16,6 +16,7 @@ Source1: index.bin.c Source2: reboot.sh Source14: ihttpd.tmpfiles Source15: ihttpd.service +Source16: debug-sshd.service Source18: ihttpd.dracut Source19: ihttpd.module-setup Source20: ihttpd.conf @@ -127,6 +128,7 @@ install -m 644 %{SOURCE1} index.bin.c # regenerate configure scripts autoheader && autoconf || exit 1 +# Required to be able to run as root export CFLAGS="$RPM_OPT_FLAGS -DBIG_SECURITY_HOLE" export LDFLAGS="-Wl,-z,relro,-z,now" @@ -167,7 +169,6 @@ export LYNX_PATH=/usr/bin/links %make export CFLAGS="$RPM_OPT_FLAGS" -# -m64 -std=c99 -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes gcc index.bin.c -o index.bin %install @@ -187,10 +188,11 @@ install -D -p -m 755 %{SOURCE19} %{buildroot}%{_prefix}/lib/dracut/modules.d/99i #Ihttpd files install -d -m 755 %{buildroot}%{_prefix}/lib/%{name} -install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/index.bin +install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/ install -D -p -m 755 %{SOURCE2} %{buildroot}%{_prefix}/lib/%{name}/reboot.bin -install -D -p -m 644 %{SOURCE20} %{buildroot}%{_prefix}/lib/%{name}/ihttpd.conf -install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/ihttpd.service +install -D -p -m 644 %{SOURCE20} %{buildroot}%{_prefix}/lib/%{name}/ +install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/ +install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/ %find_lang %name @@ -208,5 +210,6 @@ install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/ihttpd.servi %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh %dir %{_prefix}/lib/%{name} %{_prefix}/lib/%{name}/%{name}.service +%{_prefix}/lib/%{name}/debug-sshd.service %{_prefix}/lib/%{name}/index.bin %{_prefix}/lib/%{name}/reboot.bin