enhance qpopper package

qpopper/qpopper.spec

@@ -32,7 +32,7 @@ Packager:     rse@openpkg.org
 Distribution: OpenPKG
 License:      GPL
 Version:      4.0.3
-Release:      4
+Release:      5
 
 #   list of sources
 Source0:      ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper%{version}.tar.gz
@@ -41,8 +41,8 @@ Source1:      rc.qpopper
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 0.9-33, MTA
-PreReq:       OpenPKG, openpkg >= 0.9-33, MTA
+BuildPreReq:  OpenPKG, openpkg >= 0.9-33, MTA, openssl
+PreReq:       OpenPKG, openpkg >= 0.9-33, MTA, openssl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -66,6 +66,7 @@ AutoReqProv:  no
         --enable-home-dir-mail=.mail/inbox \
         --with-log-facility=LOG_LOCAL5 \
         --enable-nonauth-file=%{l_prefix}/etc/qpopper/users.deny \
+        --with-openssl=%{l_prefix} \
         --disable-nls
     %{l_rpmtool} subst \
         's;\(MAIL_COMMAND[^"]*"\)[^"]*;\1%{l_prefix}/sbin/sendmail;' \
@@ -74,13 +75,20 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man8
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper
-    %{l_shtool} install -c -s -m 755 popper/popper $RPM_BUILD_ROOT%{l_prefix}/bin/qpopper
-    %{l_shtool} install -c -m 644 man/popper.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qpopper.8
-    %{l_shtool} install -c -m 644 /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/users.deny
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper
+    %{l_shtool} install -c -m 644 \
+        samples/qpopper.config $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/
+    %{l_shtool} install -c -s -m 755 \
+        popper/popper $RPM_BUILD_ROOT%{l_prefix}/sbin/qpopper
+    %{l_shtool} install -c -m 644 \
+        man/popper.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qpopper.8
+    %{l_shtool} install -c -m 644 \
+        /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/users.deny
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
         %{SOURCE rc.qpopper} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

qpopper/rc.qpopper

@@ -0,0 +1,22 @@
+#!@l_prefix@/lib/rpm/bash @l_prefix@/etc/rc
+##
+##  rc.qpopper -- Run-Commands for QPopper Daemon
+##
+
+%config
+    qpopper_enable="yes"
+
+%start -p 200 -u root
+    opServiceEnabled qpopper || exit 0
+    @l_prefix@/sbin/qpopper -f @l_prefix@/etc/qpopper/qpopper.config
+
+%stop -p 200 -u root
+    opServiceEnabled qpopper || exit 0
+    kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
+
+%restart -u root
+    opServiceEnabled qpopper || exit 0
+    kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
+    sleep 2
+    @l_prefix@/sbin/qpopper -f @l_prefix@/etc/qpopper/qpopper.config
+